diff --git a/FL/Fl_File_Chooser.H b/FL/Fl_File_Chooser.H index 039832c2e..510c71aff 100644 --- a/FL/Fl_File_Chooser.H +++ b/FL/Fl_File_Chooser.H @@ -74,63 +74,63 @@ private: public: Fl_File_Chooser(const char *pathname, const char *pattern, int type_val, const char *title); private: - Fl_Double_Window *window; + Fl_Double_Window* window; inline void cb_window_i(Fl_Double_Window*, void*); static void cb_window(Fl_Double_Window*, void*); - Fl_Choice *showChoice; + Fl_Choice* showChoice; inline void cb_showChoice_i(Fl_Choice*, void*); static void cb_showChoice(Fl_Choice*, void*); - Fl_Menu_Button *favoritesButton; + Fl_Menu_Button* favoritesButton; inline void cb_favoritesButton_i(Fl_Menu_Button*, void*); static void cb_favoritesButton(Fl_Menu_Button*, void*); public: - Fl_Button *newButton; + Fl_Button* newButton; private: inline void cb_newButton_i(Fl_Button*, void*); static void cb_newButton(Fl_Button*, void*); inline void cb__i(Fl_Tile*, void*); static void cb_(Fl_Tile*, void*); - Fl_File_Browser *fileList; + Fl_File_Browser* fileList; inline void cb_fileList_i(Fl_File_Browser*, void*); static void cb_fileList(Fl_File_Browser*, void*); - Fl_Box *errorBox; - Fl_Box *previewBox; + Fl_Box* errorBox; + Fl_Box* previewBox; public: - Fl_Check_Button *previewButton; + Fl_Check_Button* previewButton; private: inline void cb_previewButton_i(Fl_Check_Button*, void*); static void cb_previewButton(Fl_Check_Button*, void*); public: - Fl_Check_Button *showHiddenButton; + Fl_Check_Button* showHiddenButton; private: inline void cb_showHiddenButton_i(Fl_Check_Button*, void*); static void cb_showHiddenButton(Fl_Check_Button*, void*); - Fl_File_Input *fileName; + Fl_File_Input* fileName; inline void cb_fileName_i(Fl_File_Input*, void*); static void cb_fileName(Fl_File_Input*, void*); - Fl_Return_Button *okButton; + Fl_Return_Button* okButton; inline void cb_okButton_i(Fl_Return_Button*, void*); static void cb_okButton(Fl_Return_Button*, void*); - Fl_Button *cancelButton; + Fl_Button* cancelButton; inline void cb_cancelButton_i(Fl_Button*, void*); static void cb_cancelButton(Fl_Button*, void*); - Fl_Double_Window *favWindow; - Fl_File_Browser *favList; + Fl_Double_Window* favWindow; + Fl_File_Browser* favList; inline void cb_favList_i(Fl_File_Browser*, void*); static void cb_favList(Fl_File_Browser*, void*); - Fl_Button *favUpButton; + Fl_Button* favUpButton; inline void cb_favUpButton_i(Fl_Button*, void*); static void cb_favUpButton(Fl_Button*, void*); - Fl_Button *favDeleteButton; + Fl_Button* favDeleteButton; inline void cb_favDeleteButton_i(Fl_Button*, void*); static void cb_favDeleteButton(Fl_Button*, void*); - Fl_Button *favDownButton; + Fl_Button* favDownButton; inline void cb_favDownButton_i(Fl_Button*, void*); static void cb_favDownButton(Fl_Button*, void*); - Fl_Button *favCancelButton; + Fl_Button* favCancelButton; inline void cb_favCancelButton_i(Fl_Button*, void*); static void cb_favCancelButton(Fl_Button*, void*); - Fl_Return_Button *favOkButton; + Fl_Return_Button* favOkButton; inline void cb_favOkButton_i(Fl_Return_Button*, void*); static void cb_favOkButton(Fl_Return_Button*, void*); public: diff --git a/fluid/app/Image_Asset.cxx b/fluid/app/Image_Asset.cxx index 7a05cd99b..9ebb7778f 100644 --- a/fluid/app/Image_Asset.cxx +++ b/fluid/app/Image_Asset.cxx @@ -192,7 +192,7 @@ void Image_Asset::write_static(fld::io::Code_Writer& f, int compressed) { // Write Pixmap data... f.write_c("\n"); f.write_c_once("#include \n"); - f.write_c("static const char *%s[] = {\n", idata_name); + f.write_c("static const char* %s[] = {\n", idata_name); f.write_cstring(image_->data()[0], (int)strlen(image_->data()[0])); int i; @@ -322,10 +322,10 @@ void Image_Asset::write_file_error(fld::io::Code_Writer& f, const char *fmt) { void Image_Asset::write_initializer(fld::io::Code_Writer& f, const char *image_class, const char *format, ...) { va_list ap; va_start(ap, format); - f.write_c("static Fl_Image *%s() {\n", initializer_function_.c_str()); + f.write_c("static Fl_Image* %s() {\n", initializer_function_.c_str()); if (is_animated_gif_) f.write_c("%sFl_GIF_Image::animate = true;\n", f.indent(1)); - f.write_c("%sstatic Fl_Image *image = 0L;\n", f.indent(1)); + f.write_c("%sstatic Fl_Image* image = nullptr;\n", f.indent(1)); f.write_c("%sif (!image)\n", f.indent(1)); f.write_c("%simage = new %s(", f.indent(2), image_class); f.vwrite_c(format, ap); diff --git a/fluid/io/Code_Writer.cxx b/fluid/io/Code_Writer.cxx index 53e82997b..0de47bf61 100644 --- a/fluid/io/Code_Writer.cxx +++ b/fluid/io/Code_Writer.cxx @@ -721,7 +721,7 @@ int Code_Writer::write_code(const char *s, const char *t, bool to_codeview) { } else { write_c("// Initialize I18N stuff now for menus...\n"); write_c("#%sinclude \n", indent()); - write_c("static char *_locale = setlocale(LC_MESSAGES, \"\");\n"); + write_c("static char* _locale = setlocale(LC_MESSAGES, \"\");\n"); write_c("static nl_catd _catalog = catopen(\"%s\", 0);\n", proj_.basename().c_str()); } } diff --git a/fluid/nodes/Function_Node.cxx b/fluid/nodes/Function_Node.cxx index 8404b931e..f140fb39d 100644 --- a/fluid/nodes/Function_Node.cxx +++ b/fluid/nodes/Function_Node.cxx @@ -333,7 +333,7 @@ void Function_Node::write_code1(fld::io::Code_Writer& f) { f.write_c("\n"); if (ismain()) { if (havechildren) - f.write_c("int main(int argc, char **argv) {\n"); + f.write_c("int main(int argc, char** argv) {\n"); } else { std::string rtype = return_type(); std::string star = ""; @@ -993,8 +993,8 @@ void Data_Node::write_code1(fld::io::Code_Writer& f) { f.write_c("\n"); write_comment_c(f); if (output_format_ == 1) { - f.write_h("%sstatic const char *%s;\n", f.indent(1), c); - f.write_c("const char *%s::%s = /* text inlined from %s */\n", class_name(1), c, fn.c_str()); + f.write_h("%sstatic const char* %s;\n", f.indent(1), c); + f.write_c("const char* %s::%s = /* text inlined from %s */\n", class_name(1), c, fn.c_str()); } else { f.write_h_once("#include "); f.write_h("%sstatic const std::string %s;\n", f.indent(1), c); @@ -1042,8 +1042,8 @@ void Data_Node::write_code1(fld::io::Code_Writer& f) { f.write_c("\n"); write_comment_c(f); if (output_format_ == 1) { - f.write_h("extern const char *%s;\n", c); - f.write_c("const char *%s = /* text inlined from %s */\n", c, fn.c_str()); + f.write_h("extern const char* %s;\n", c); + f.write_c("const char* %s = /* text inlined from %s */\n", c, fn.c_str()); } else { f.write_h_once("#include "); f.write_h("extern const std::string %s;\n", c); @@ -1087,7 +1087,7 @@ void Data_Node::write_code1(fld::io::Code_Writer& f) { write_comment_h(f); f.write_h("#error Unsupported declaration loading inline data %s\n", fn.c_str()); if (output_format_ == 1) - f.write_h("const char *%s = \"abc...\";\n", c); + f.write_h("const char* %s = \"abc...\";\n", c); else f.write_h("unsigned char %s[3] = { 1, 2, 3 };\n", c); } @@ -1097,7 +1097,7 @@ void Data_Node::write_code1(fld::io::Code_Writer& f) { if ((output_format_ == 1) || (output_format_ == 4)) { if (output_format_ == 1) { if (static_) f.write_c("static "); - f.write_c("const char *%s = /* text inlined from %s */\n", c, fn.c_str()); + f.write_c("const char* %s = /* text inlined from %s */\n", c, fn.c_str()); } else { f.write_c_once("#include "); if (static_) f.write_c("static "); diff --git a/fluid/nodes/Grid_Node.cxx b/fluid/nodes/Grid_Node.cxx index 06f6d4166..36812a9ce 100644 --- a/fluid/nodes/Grid_Node.cxx +++ b/fluid/nodes/Grid_Node.cxx @@ -617,7 +617,7 @@ void Grid_Node::write_code2(fld::io::Code_Writer& f) { Fl_Grid::Cell *cell = grid->cell(c); if (cell) { if (first_cell) { - f.write_c("%sFl_Grid::Cell *cell = 0L;\n", f.indent()); + f.write_c("%sFl_Grid::Cell* cell = nullptr;\n", f.indent()); first_cell = false; } f.write_c("%scell = %s->widget(%s->child(%d), %d, %d, %d, %d, %d);\n", diff --git a/fluid/nodes/Menu_Node.cxx b/fluid/nodes/Menu_Node.cxx index 0647d428b..835586585 100644 --- a/fluid/nodes/Menu_Node.cxx +++ b/fluid/nodes/Menu_Node.cxx @@ -432,9 +432,13 @@ void Menu_Item_Node::write_static(fld::io::Code_Writer& f) { int thislevel = q->level; if (q->can_have_children()) thislevel++; int nextlevel = (q->next && q->next->is_a(Type::Menu_Item)) ? q->next->level : t->level+1; - while (thislevel > nextlevel) {f.write_c(" {0,0,0,0,0,0,0,0,0},\n"); thislevel--;} + while (thislevel > nextlevel) { + // text, shortcut, callback, user_data, flags, labeltype, labelfont, labelsize, labelcolor + f.write_c(" { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 },\n"); + thislevel--; + } } - f.write_c(" {0,0,0,0,0,0,0,0,0}\n};\n"); + f.write_c(" { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 }\n};\n"); if (k) { // Write menu item variables... @@ -486,8 +490,11 @@ void Menu_Item_Node::write_item(fld::io::Code_Writer& f) { "FL_IMAGE_LABEL" }; + // Start of Fl_Menu_Item array member write_comment_inline_c(f, " "); f.write_c(" {"); + + // Label, can not be nullptr which has a special meaning here if (label() && label()[0]) switch (Fluid.proj.i18n.type) { case fld::I18n_Type::GNU: @@ -503,6 +510,8 @@ void Menu_Item_Node::write_item(fld::io::Code_Writer& f) { } else f.write_c("\"\""); + + // Shortcut, try to write it in a human readable form, else write it as hex if (((Fl_Button*)o)->shortcut()) { int s = ((Fl_Button*)o)->shortcut(); f.write_c(", "); @@ -518,12 +527,15 @@ void Menu_Item_Node::write_item(fld::io::Code_Writer& f) { if ((s < 127) && isprint(s)) f.write_c("'%c', ", s); else - f.write_c("0x%x, ", s); + f.write_c("0x%08x, ", s); } else { f.write_c(", 0, "); } + + // Write callback or nullptr if (callback()) { if (callback()[0] == '[') { + // Write lambda expressions inline, allow mergeback f.write_c("\n"); f.tag(Mergeback::Tag::GENERIC, Mergeback::Tag::WIDGET_CALLBACK, 0); f.write_c_indented(callback(), 1, 0); @@ -531,6 +543,7 @@ void Menu_Item_Node::write_item(fld::io::Code_Writer& f) { f.tag(Mergeback::Tag::WIDGET_CALLBACK, Mergeback::Tag::GENERIC, get_uid()); f.write_c("%s, ", f.indent_plus(1)); } else { + // Write named callback, try to qualify it with the class name if possible const char* k = is_name(callback()) ? nullptr : class_name(1); if (k) { f.write_c(" (Fl_Callback*)%s::%s,", k, callback_name(f)); @@ -539,12 +552,16 @@ void Menu_Item_Node::write_item(fld::io::Code_Writer& f) { } } } else - f.write_c(" 0,"); + f.write_c(" nullptr,"); + + // Write user_data or nullptr if (!user_data().empty()) f.write_c(" (void*)(%s),", user_data().c_str()); else - f.write_c(" 0,"); - f.write_c(" %d, (uchar)%s, %d, %d, %d", flags(), + f.write_c(" nullptr,"); + + // Write flags, labeltype, labelfont, labelsize, and labelcolor + f.write_c(" %d, (uchar)%s, %d, %d, %d ", flags(), labeltypes[o->labeltype()], o->labelfont(), o->labelsize(), o->labelcolor()); f.write_c("},\n"); } @@ -573,12 +590,12 @@ void Menu_Item_Node::write_code1(fld::io::Code_Writer& f) { if (c) { if (class_name(1)) { f.write_public(public_); - f.write_h("%sstatic Fl_Menu_Item *%s;\n", f.indent(1), c); + f.write_h("%sstatic Fl_Menu_Item* %s;\n", f.indent(1), c); } else { if (c==name()) f.write_h("#define %s (%s+%d)\n", c, mname, i); else - f.write_h("extern Fl_Menu_Item *%s;\n", c); + f.write_h("extern Fl_Menu_Item* %s;\n", c); } } @@ -600,7 +617,7 @@ void Menu_Item_Node::write_code1(fld::io::Code_Writer& f) { if (image) { start_menu_initialiser(f, menuItemInitialized, mname, i); if (label() && label()[0]) { - f.write_c("%sFl_Multi_Label *ml = new Fl_Multi_Label;\n", f.indent()); + f.write_c("%sFl_Multi_Label* ml = new Fl_Multi_Label;\n", f.indent()); f.write_c("%sml->labela = (char*)", f.indent()); image->write_inline(f); f.write_c(";\n"); @@ -867,9 +884,9 @@ void Menu_Bar_Node::write_static(fld::io::Code_Writer& f) { f.write_c_once( // must be less than 1024 bytes! "\nclass %s: public %s {\n" "public:\n" - " %s(int x, int y, int w, int h, const char *l=0L)\n" + " %s(int x, int y, int w, int h, const char* l=nullptr)\n" " : %s(x, y, w, h, l) { }\n" - " void *_parent_class;\n" + " void* _parent_class;\n" "};\n", sys_menubar_proxy_name(), sys_menubar_name().c_str(), sys_menubar_proxy_name(), sys_menubar_name().c_str() diff --git a/fluid/nodes/Widget_Node.cxx b/fluid/nodes/Widget_Node.cxx index 23662f7f3..d06588327 100644 --- a/fluid/nodes/Widget_Node.cxx +++ b/fluid/nodes/Widget_Node.cxx @@ -1538,9 +1538,11 @@ void Widget_Node::write_static(fld::io::Code_Writer& f) { if (c && !k && !is_class()) { f.write_c("\n"); if (!public_) f.write_c("static "); - else f.write_h("extern %s *%s;\n", t.c_str(), c); - if (strchr(c, '[') == nullptr) f.write_c("%s *%s=(%s *)0;\n", t.c_str(), c, t.c_str()); - else f.write_c("%s *%s={(%s *)0};\n", t.c_str(), c, t.c_str()); + else f.write_h("extern %s* %s;\n", t.c_str(), c); + if (strchr(c, '[') == nullptr) + f.write_c("%s* %s = (%s*)nullptr;\n", t.c_str(), c, t.c_str()); + else + f.write_c("%s* %s = {(%s*)nullptr};\n", t.c_str(), c, t.c_str()); } if (callback() && !is_name(callback()) && (callback()[0] != '[')) { // see if 'o' or 'v' used, to prevent unused argument warnings: @@ -1604,7 +1606,7 @@ void Widget_Node::write_code1(fld::io::Code_Writer& f) { if (c) { if (class_name(1)) { f.write_public(public_); - f.write_h("%s%s *%s;\n", f.indent(1), t.c_str(), c); + f.write_h("%s%s* %s;\n", f.indent(1), t.c_str(), c); } } if (class_name(1) && callback() && !is_name(callback())) { @@ -1933,7 +1935,7 @@ void Widget_Node::write_widget_code(fld::io::Code_Writer& f) { f.write_c_indented(callback(), 1, 0); f.write_c("\n"); f.tag(Mergeback::Tag::WIDGET_CALLBACK, Mergeback::Tag::GENERIC, get_uid()); - f.write_c("%s", f.indent_plus(1)); + f.write_c("%s", f.indent()); } else { f.write_c("%s%s->callback((Fl_Callback*)%s", f.indent(), var, callback_name(f)); } diff --git a/fluid/nodes/Window_Node.cxx b/fluid/nodes/Window_Node.cxx index 0ea3b306f..8a9e5b486 100644 --- a/fluid/nodes/Window_Node.cxx +++ b/fluid/nodes/Window_Node.cxx @@ -1391,18 +1391,18 @@ void Widget_Class_Node::write_code1(fld::io::Code_Writer& f) { if (c.find("Window")!=c.npos) { f.write_h("%svoid _%s();\n", f.indent(1), trimclassname(name())); f.write_h("public:\n"); - f.write_h("%s%s(int X, int Y, int W, int H, const char *L = 0);\n", f.indent(1), trimclassname(name())); - f.write_h("%s%s(int W, int H, const char *L = 0);\n", f.indent(1), trimclassname(name())); + f.write_h("%s%s(int X, int Y, int W, int H, const char* L=nullptr);\n", f.indent(1), trimclassname(name())); + f.write_h("%s%s(int W, int H, const char* L=nullptr);\n", f.indent(1), trimclassname(name())); f.write_h("%s%s();\n", f.indent(1), trimclassname(name())); // a constructor with all four dimensions plus label - f.write_c("%s::%s(int X, int Y, int W, int H, const char *L) :\n", name(), trimclassname(name())); + f.write_c("%s::%s(int X, int Y, int W, int H, const char* L) :\n", name(), trimclassname(name())); f.write_c("%s%s(X, Y, W, H, L)\n{\n", f.indent(1), c.c_str()); f.write_c("%s_%s();\n", f.indent(1), trimclassname(name())); f.write_c("}\n\n"); // a constructor with just the size and label. The window manager will position the window - f.write_c("%s::%s(int W, int H, const char *L) :\n", name(), trimclassname(name())); + f.write_c("%s::%s(int W, int H, const char* L) :\n", name(), trimclassname(name())); f.write_c("%s%s(0, 0, W, H, L)\n{\n", f.indent(1), c.c_str()); f.write_c("%sclear_flag(16);\n", f.indent(1)); f.write_c("%s_%s();\n", f.indent(1), trimclassname(name())); @@ -1413,19 +1413,19 @@ void Widget_Class_Node::write_code1(fld::io::Code_Writer& f) { f.write_c("%s%s(0, 0, %d, %d, ", f.indent(1), c.c_str(), o->w(), o->h()); const char *cstr = label(); if (cstr) f.write_cstring(cstr); - else f.write_c("0"); + else f.write_c("nullptr"); f.write_c(")\n{\n"); f.write_c("%sclear_flag(16);\n", f.indent(1)); f.write_c("%s_%s();\n", f.indent(1), trimclassname(name())); f.write_c("}\n\n"); f.write_c("void %s::_%s() {\n", name(), trimclassname(name())); -// f.write_c("%s%s *w = this;\n", f.indent(1), name()); +// f.write_c("%s%s* w = this;\n", f.indent(1), name()); } else { f.write_h("public:\n"); - f.write_h("%s%s(int X, int Y, int W, int H, const char *L = 0);\n", + f.write_h("%s%s(int X, int Y, int W, int H, const char* L=nullptr);\n", f.indent(1), trimclassname(name())); - f.write_c("%s::%s(int X, int Y, int W, int H, const char *L) :\n", name(), trimclassname(name())); + f.write_c("%s::%s(int X, int Y, int W, int H, const char* L) :\n", name(), trimclassname(name())); if (wc_relative==1) f.write_c("%s%s(0, 0, W, H, L)\n{\n", f.indent(1), c.c_str()); else if (wc_relative==2) @@ -1434,7 +1434,7 @@ void Widget_Class_Node::write_code1(fld::io::Code_Writer& f) { f.write_c("%s%s(X, Y, W, H, L)\n{\n", f.indent(1), c.c_str()); } -// f.write_c("%s%s *o = this;\n", f.indent(1), name()); +// f.write_c("%s%s* o = this;\n", f.indent(1), name()); f.indentation++; write_widget_code(f); diff --git a/fluid/panels/about_panel.cxx b/fluid/panels/about_panel.cxx index 6c78314dd..a5f5ecd68 100644 --- a/fluid/panels/about_panel.cxx +++ b/fluid/panels/about_panel.cxx @@ -18,7 +18,7 @@ #include "about_panel.h" -Fl_Double_Window *about_panel=(Fl_Double_Window *)0; +Fl_Double_Window* about_panel = (Fl_Double_Window*)nullptr; #include @@ -137,9 +137,9 @@ static const unsigned char idata_fluid[] = 215,191,39,177,156,197,110,73,96,231,235,117,71,189,190,167,124,240,162,74,186, 229,149,46,246,215,249,176,251,185,160,247,56,85,177,37,67,81,188,17,231,220,17, 99,199,176,225,186,61,16,35,74,220,19,2,0,59}; -static Fl_Image *image_fluid() { +static Fl_Image* image_fluid() { Fl_GIF_Image::animate = true; - static Fl_Image *image = 0L; + static Fl_Image* image = nullptr; if (!image) image = new Fl_Anim_GIF_Image("fluid.animated.gif", idata_fluid, 2545); return image; diff --git a/fluid/panels/about_panel.fl b/fluid/panels/about_panel.fl index 7ed5f1b4a..c484a8c7a 100644 --- a/fluid/panels/about_panel.fl +++ b/fluid/panels/about_panel.fl @@ -73,5 +73,5 @@ Version x.x.x} } data fluid_flow_chart_800_png { - comment {Embedded image for internal fluid.html web page.} selected public local filename {../documentation/src/fluid_flow_chart_800.png} + comment {Embedded image for internal fluid.html web page.} public local filename {../documentation/src/fluid_flow_chart_800.png} } diff --git a/fluid/panels/about_panel.h b/fluid/panels/about_panel.h index 421b1d40c..d77930fcd 100644 --- a/fluid/panels/about_panel.h +++ b/fluid/panels/about_panel.h @@ -23,7 +23,7 @@ #include #include #include "../src/flstring.h" -extern Fl_Double_Window *about_panel; +extern Fl_Double_Window* about_panel; #include #include #include diff --git a/fluid/panels/codeview_panel.cxx b/fluid/panels/codeview_panel.cxx index 93b71013e..73510d6a4 100644 --- a/fluid/panels/codeview_panel.cxx +++ b/fluid/panels/codeview_panel.cxx @@ -251,25 +251,25 @@ void codeview_toggle_visibility() { } } -Fl_Double_Window *codeview_panel=(Fl_Double_Window *)0; +Fl_Double_Window* codeview_panel = (Fl_Double_Window*)nullptr; -Fl_Tabs *cv_tab=(Fl_Tabs *)0; +Fl_Tabs* cv_tab = (Fl_Tabs*)nullptr; -Fl_Group *cv_source_tab=(Fl_Group *)0; +Fl_Group* cv_source_tab = (Fl_Group*)nullptr; -fld::widget::Code_Viewer *cv_source=(fld::widget::Code_Viewer *)0; +fld::widget::Code_Viewer* cv_source = (fld::widget::Code_Viewer*)nullptr; -fld::widget::Code_Viewer *cv_header=(fld::widget::Code_Viewer *)0; +fld::widget::Code_Viewer* cv_header = (fld::widget::Code_Viewer*)nullptr; -fld::widget::Text_Viewer *cv_strings=(fld::widget::Text_Viewer *)0; +fld::widget::Text_Viewer* cv_strings = (fld::widget::Text_Viewer*)nullptr; -fld::widget::Text_Viewer *cv_project=(fld::widget::Text_Viewer *)0; +fld::widget::Text_Viewer* cv_project = (fld::widget::Text_Viewer*)nullptr; -Fl_Group *cv_find_row=(Fl_Group *)0; +Fl_Group* cv_find_row = (Fl_Group*)nullptr; -Fl_Button *cv_find_text_case=(Fl_Button *)0; +Fl_Button* cv_find_text_case = (Fl_Button*)nullptr; -Fl_Input *cv_find_text=(Fl_Input *)0; +Fl_Input* cv_find_text = (Fl_Input*)nullptr; static void cb_cv_find_text(Fl_Input* o, void*) { Fl_Text_Display *e = nullptr; @@ -360,13 +360,13 @@ static void cb_Reveal(Fl_Button*, void*) { } } -Fl_Group *cv_settings_row=(Fl_Group *)0; +Fl_Group* cv_settings_row = (Fl_Group*)nullptr; -Fl_Light_Button *cv_autorefresh=(Fl_Light_Button *)0; +Fl_Light_Button* cv_autorefresh = (Fl_Light_Button*)nullptr; -Fl_Light_Button *cv_autoposition=(Fl_Light_Button *)0; +Fl_Light_Button* cv_autoposition = (Fl_Light_Button*)nullptr; -Fl_Choice *cv_code_choice_w=(Fl_Choice *)0; +Fl_Choice* cv_code_choice_w = (Fl_Choice*)nullptr; static void cb_cv_code_choice_w(Fl_Choice* o, void*) { cv_code_choice = (int)o->mvalue()->argument(); @@ -374,12 +374,12 @@ static void cb_cv_code_choice_w(Fl_Choice* o, void*) { } Fl_Menu_Item menu_cv_code_choice_w[] = { - {"prolog", 0, 0, (void*)(0), 16, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"static", 0, 0, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"code", 0, 0, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"code 1", 0, 0, (void*)(3), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"code 2", 0, 0, (void*)(4), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {0,0,0,0,0,0,0,0,0} + {"prolog", 0, nullptr, (void*)(0), 16, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"static", 0, nullptr, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"code", 0, nullptr, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"code 1", 0, nullptr, (void*)(3), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"code 2", 0, nullptr, (void*)(4), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; Fl_Double_Window* make_codeview() { diff --git a/fluid/panels/codeview_panel.h b/fluid/panels/codeview_panel.h index ba30336df..d9409c477 100644 --- a/fluid/panels/codeview_panel.h +++ b/fluid/panels/codeview_panel.h @@ -28,29 +28,29 @@ void codeview_defer_update(); void codeview_toggle_visibility(); #include extern void toggle_codeview_cb(Fl_Double_Window*, void*); -extern Fl_Double_Window *codeview_panel; +extern Fl_Double_Window* codeview_panel; #include -extern Fl_Tabs *cv_tab; +extern Fl_Tabs* cv_tab; #include -extern Fl_Group *cv_source_tab; +extern Fl_Group* cv_source_tab; #include "widgets/Code_Viewer.h" -extern fld::widget::Code_Viewer *cv_source; -extern fld::widget::Code_Viewer *cv_header; +extern fld::widget::Code_Viewer* cv_source; +extern fld::widget::Code_Viewer* cv_header; #include "widgets/Text_Viewer.h" -extern fld::widget::Text_Viewer *cv_strings; -extern fld::widget::Text_Viewer *cv_project; -extern Fl_Group *cv_find_row; +extern fld::widget::Text_Viewer* cv_strings; +extern fld::widget::Text_Viewer* cv_project; +extern Fl_Group* cv_find_row; #include -extern Fl_Button *cv_find_text_case; +extern Fl_Button* cv_find_text_case; #include -extern Fl_Input *cv_find_text; +extern Fl_Input* cv_find_text; #include -extern Fl_Group *cv_settings_row; +extern Fl_Group* cv_settings_row; #include -extern Fl_Light_Button *cv_autorefresh; -extern Fl_Light_Button *cv_autoposition; +extern Fl_Light_Button* cv_autorefresh; +extern Fl_Light_Button* cv_autoposition; #include -extern Fl_Choice *cv_code_choice_w; +extern Fl_Choice* cv_code_choice_w; extern void toggle_codeview_b_cb(Fl_Button*, void*); Fl_Double_Window* make_codeview(); extern Fl_Menu_Item menu_cv_code_choice_w[]; diff --git a/fluid/panels/function_panel.cxx b/fluid/panels/function_panel.cxx index 4fea9aa1e..1e1a7d368 100644 --- a/fluid/panels/function_panel.cxx +++ b/fluid/panels/function_panel.cxx @@ -33,7 +33,7 @@ void type_make_cb(Fl_Widget*,void*d) { add_new_widget_from_user(type_name, Strategy::AFTER_CURRENT); } -Fl_Window *widgetbin_panel=(Fl_Window *)0; +Fl_Window* widgetbin_panel = (Fl_Window*)nullptr; static void cb_widgetbin_panel(Fl_Window*, void*) { if (Fl::event()==FL_SHORTCUT && Fl::event_key()==FL_Escape) diff --git a/fluid/panels/function_panel.fl b/fluid/panels/function_panel.fl index 23240f469..f8f974d9b 100644 --- a/fluid/panels/function_panel.fl +++ b/fluid/panels/function_panel.fl @@ -501,5 +501,5 @@ else } comment { -//} {in_source in_header +//} {selected in_source in_header } diff --git a/fluid/panels/function_panel.h b/fluid/panels/function_panel.h index 207a9ee84..070887eda 100644 --- a/fluid/panels/function_panel.h +++ b/fluid/panels/function_panel.h @@ -21,7 +21,7 @@ #include void type_make_cb(Fl_Widget*,void*d); #include -extern Fl_Window *widgetbin_panel; +extern Fl_Window* widgetbin_panel; #include #include Fl_Window* make_widgetbin(); diff --git a/fluid/panels/settings_panel.cxx b/fluid/panels/settings_panel.cxx index e691e9e97..d90aa46c4 100644 --- a/fluid/panels/settings_panel.cxx +++ b/fluid/panels/settings_panel.cxx @@ -64,7 +64,7 @@ static void cb_Color_Choice(Fl_Menu_Button* o, void* v) { } } -Fl_Double_Window *script_panel=(Fl_Double_Window *)0; +Fl_Double_Window* script_panel = (Fl_Double_Window*)nullptr; static void cb_script_panel(Fl_Double_Window*, void*) { if (Fl::event()==FL_SHORTCUT && Fl::event_key()==FL_Escape) @@ -72,11 +72,11 @@ static void cb_script_panel(Fl_Double_Window*, void*) { script_panel->hide(); // otherwise hide..; } -Fl_Text_Editor *script_input=(Fl_Text_Editor *)0; +Fl_Text_Editor* script_input = (Fl_Text_Editor*)nullptr; -Fl_Button *script_panel_cancel=(Fl_Button *)0; +Fl_Button* script_panel_cancel = (Fl_Button*)nullptr; -Fl_Return_Button *script_panel_ok=(Fl_Return_Button *)0; +Fl_Return_Button* script_panel_ok = (Fl_Return_Button*)nullptr; Fl_Double_Window* make_script_panel() { { Fl_Double_Window* o = script_panel = new Fl_Double_Window(540, 184, "Shell Script Editor"); @@ -115,15 +115,15 @@ Fl_Double_Window* make_script_panel() { return script_panel; } -Fl_Double_Window *settings_window=(Fl_Double_Window *)0; +Fl_Double_Window* settings_window = (Fl_Double_Window*)nullptr; -Fl_Tabs *w_settings_tabs=(Fl_Tabs *)0; +Fl_Tabs* w_settings_tabs = (Fl_Tabs*)nullptr; static void cb_w_settings_tabs(Fl_Tabs* o, void* v) { propagate_load(o, v); } -Fl_Group *w_settings_general_tab=(Fl_Group *)0; +Fl_Group* w_settings_general_tab = (Fl_Group*)nullptr; #include @@ -227,8 +227,8 @@ static const unsigned char idata_general_64[] = 102,160,155,127,210,133,147,49,68,161,224,192,1,40,120,241,208,73,37,239,176, 150,102,123,63,248,127,27,97,180,206,27,14,172,151,0,0,0,0,73,69,78,68,174,66, 96,130}; -static Fl_Image *image_general_64() { - static Fl_Image *image = 0L; +static Fl_Image* image_general_64() { + static Fl_Image* image = nullptr; if (!image) image = new Fl_PNG_Image("general_64.png", idata_general_64, 2162); return image; @@ -238,38 +238,38 @@ static void cb_(Fl_Group* o, void* v) { propagate_load(o, v); } -Fl_Scheme_Choice *scheme_choice=(Fl_Scheme_Choice *)0; +Fl_Scheme_Choice* scheme_choice = (Fl_Scheme_Choice*)nullptr; static void cb_scheme_choice(Fl_Scheme_Choice* o, void*) { Fluid.set_scheme(o->text(o->value())); } -Fl_Check_Button *tooltips_button=(Fl_Check_Button *)0; +Fl_Check_Button* tooltips_button = (Fl_Check_Button*)nullptr; static void cb_tooltips_button(Fl_Check_Button*, void*) { Fl_Tooltip::enable(tooltips_button->value()); Fluid.preferences.set("show_tooltips", tooltips_button->value()); } -Fl_Check_Button *completion_button=(Fl_Check_Button *)0; +Fl_Check_Button* completion_button = (Fl_Check_Button*)nullptr; static void cb_completion_button(Fl_Check_Button*, void*) { Fluid.preferences.set("show_completion_dialogs", completion_button->value()); } -Fl_Check_Button *openlast_button=(Fl_Check_Button *)0; +Fl_Check_Button* openlast_button = (Fl_Check_Button*)nullptr; static void cb_openlast_button(Fl_Check_Button*, void*) { Fluid.preferences.set("open_previous_file", openlast_button->value()); } -Fl_Check_Button *prevpos_button=(Fl_Check_Button *)0; +Fl_Check_Button* prevpos_button = (Fl_Check_Button*)nullptr; static void cb_prevpos_button(Fl_Check_Button*, void*) { Fluid.preferences.set("prev_window_pos", prevpos_button->value()); } -Fl_Check_Button *show_comments_button=(Fl_Check_Button *)0; +Fl_Check_Button* show_comments_button = (Fl_Check_Button*)nullptr; static void cb_show_comments_button(Fl_Check_Button*, void*) { Fluid.show_comments = show_comments_button->value(); @@ -281,14 +281,14 @@ static void cb_1(Fl_Group* o, void* v) { propagate_load(o, v); } -Fl_Spinner *recent_spinner=(Fl_Spinner *)0; +Fl_Spinner* recent_spinner = (Fl_Spinner*)nullptr; static void cb_recent_spinner(Fl_Spinner*, void*) { Fluid.preferences.set("recent_files", recent_spinner->value()); Fluid.history.load(); } -Fl_Input *editor_command_input=(Fl_Input *)0; +Fl_Input* editor_command_input = (Fl_Input*)nullptr; static void cb_editor_command_input(Fl_Input*, void*) { strncpy(Fluid.external_editor_command, editor_command_input->value(), sizeof(Fluid.external_editor_command)-1); @@ -297,7 +297,7 @@ static void cb_editor_command_input(Fl_Input*, void*) { redraw_browser(); } -Fl_Check_Button *use_external_editor_button=(Fl_Check_Button *)0; +Fl_Check_Button* use_external_editor_button = (Fl_Check_Button*)nullptr; static void cb_use_external_editor_button(Fl_Check_Button*, void*) { Fluid.use_external_editor = use_external_editor_button->value(); @@ -305,13 +305,13 @@ static void cb_use_external_editor_button(Fl_Check_Button*, void*) { redraw_browser(); } -Fl_Check_Button *guides_button=(Fl_Check_Button *)0; +Fl_Check_Button* guides_button = (Fl_Check_Button*)nullptr; -Fl_Check_Button *restricted_button=(Fl_Check_Button *)0; +Fl_Check_Button* restricted_button = (Fl_Check_Button*)nullptr; -Fl_Check_Button *ghosted_outline_button=(Fl_Check_Button *)0; +Fl_Check_Button* ghosted_outline_button = (Fl_Check_Button*)nullptr; -Fl_Group *w_settings_project_tab=(Fl_Group *)0; +Fl_Group* w_settings_project_tab = (Fl_Group*)nullptr; static void cb_w_settings_project_tab(Fl_Group* o, void* v) { propagate_load(o, v); @@ -360,14 +360,14 @@ static const unsigned char idata_document_64[] = 193,166,213,157,233,226,175,230,234,123,185,168,229,195,61,199,184,10,219,239, 147,239,104,255,202,153,244,20,250,15,100,60,232,29,230,9,101,148,0,0,0,0,73,69, 78,68,174,66,96,130}; -static Fl_Image *image_document_64() { - static Fl_Image *image = 0L; +static Fl_Image* image_document_64() { + static Fl_Image* image = nullptr; if (!image) image = new Fl_PNG_Image("document_64.png", idata_document_64, 927); return image; } -Fl_Input *header_file_input=(Fl_Input *)0; +Fl_Input* header_file_input = (Fl_Input*)nullptr; static void cb_header_file_input(Fl_Input* o, void* v) { if (v == LOAD) { @@ -380,7 +380,7 @@ static void cb_header_file_input(Fl_Input* o, void* v) { } } -Fl_Input *code_file_input=(Fl_Input *)0; +Fl_Input* code_file_input = (Fl_Input*)nullptr; static void cb_code_file_input(Fl_Input* o, void* v) { if (v == LOAD) { @@ -393,7 +393,7 @@ static void cb_code_file_input(Fl_Input* o, void* v) { } } -Fl_Check_Button *include_H_from_C_button=(Fl_Check_Button *)0; +Fl_Check_Button* include_H_from_C_button = (Fl_Check_Button*)nullptr; static void cb_include_H_from_C_button(Fl_Check_Button* o, void* v) { if (v == LOAD) { @@ -406,7 +406,7 @@ static void cb_include_H_from_C_button(Fl_Check_Button* o, void* v) { } } -Fl_Input *include_guard_input=(Fl_Input *)0; +Fl_Input* include_guard_input = (Fl_Input*)nullptr; static void cb_include_guard_input(Fl_Input* o, void* v) { if (v == LOAD) { @@ -419,7 +419,7 @@ static void cb_include_guard_input(Fl_Input* o, void* v) { } } -Fl_Check_Button *use_FL_COMMAND_button=(Fl_Check_Button *)0; +Fl_Check_Button* use_FL_COMMAND_button = (Fl_Check_Button*)nullptr; static void cb_use_FL_COMMAND_button(Fl_Check_Button* o, void* v) { if (v == LOAD) { @@ -432,7 +432,7 @@ static void cb_use_FL_COMMAND_button(Fl_Check_Button* o, void* v) { } } -Fl_Check_Button *utf8_in_src_button=(Fl_Check_Button *)0; +Fl_Check_Button* utf8_in_src_button = (Fl_Check_Button*)nullptr; static void cb_utf8_in_src_button(Fl_Check_Button* o, void* v) { if (v == LOAD) { @@ -445,7 +445,7 @@ static void cb_utf8_in_src_button(Fl_Check_Button* o, void* v) { } } -Fl_Check_Button *avoid_early_includes_button=(Fl_Check_Button *)0; +Fl_Check_Button* avoid_early_includes_button = (Fl_Check_Button*)nullptr; static void cb_avoid_early_includes_button(Fl_Check_Button* o, void* v) { if (v == LOAD) { @@ -458,7 +458,7 @@ static void cb_avoid_early_includes_button(Fl_Check_Button* o, void* v) { } } -Fl_Check_Button *w_proj_mergeback=(Fl_Check_Button *)0; +Fl_Check_Button* w_proj_mergeback = (Fl_Check_Button*)nullptr; static void cb_w_proj_mergeback(Fl_Check_Button* o, void* v) { if (v == LOAD) { @@ -471,7 +471,7 @@ static void cb_w_proj_mergeback(Fl_Check_Button* o, void* v) { } } -Fl_Group *w_settings_layout_tab=(Fl_Group *)0; +Fl_Group* w_settings_layout_tab = (Fl_Group*)nullptr; static void cb_w_settings_layout_tab(Fl_Group* o, void* v) { propagate_load(o, v); @@ -499,14 +499,14 @@ static const unsigned char idata_layout_64[] = 75,2,144,38,31,176,218,19,53,220,188,110,251,12,50,41,61,254,154,149,216,46, 219,234,153,20,127,159,185,12,250,99,90,14,203,239,127,120,165,154,78,208,47, 215,15,118,242,56,45,94,1,0,0,0,0,73,69,78,68,174,66,96,130}; -static Fl_Image *image_layout_64() { - static Fl_Image *image = 0L; +static Fl_Image* image_layout_64() { + static Fl_Image* image = nullptr; if (!image) image = new Fl_PNG_Image("layout_64.png", idata_layout_64, 481); return image; } -Fl_Choice *layout_choice=(Fl_Choice *)0; +Fl_Choice* layout_choice = (Fl_Choice*)nullptr; static void cb_layout_choice(Fl_Choice* o, void* v) { if (v == LOAD) { @@ -519,9 +519,9 @@ static void cb_layout_choice(Fl_Choice* o, void* v) { } Fl_Menu_Item menu_layout_choice[] = { - {"FLTK", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, - {"Grid", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, - {0,0,0,0,0,0,0,0,0} + {"FLTK", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0 }, + {"Grid", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_2(Fl_Button*, void* v) { @@ -539,7 +539,7 @@ static void cb_2(Fl_Button*, void* v) { Fluid.layout_list.update_dialogs(); } -Fl_Menu_Button *w_layout_menu=(Fl_Menu_Button *)0; +Fl_Menu_Button* w_layout_menu = (Fl_Menu_Button*)nullptr; static void cb_w_layout_menu(Fl_Menu_Button*, void* v) { if (v == LOAD) { @@ -633,18 +633,18 @@ static void cb_w_layout_menu_delete(Fl_Menu_*, void*) { } Fl_Menu_Item menu_w_layout_menu[] = { - {"Rename...", 0, (Fl_Callback*)cb_w_layout_menu_rename, 0, 128, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, - {"@fd_beaker FLUID Built-In", 0, (Fl_Callback*)cb_w_layout_menu_storage, 0, 9, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, - {"@fd_user User Preference", 0, (Fl_Callback*)cb_w_layout_menu_storage1, 0, 8, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, - {"@fd_project Store in .fl Project File", 0, (Fl_Callback*)cb_w_layout_menu_storage2, 0, 8, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, - {"@fd_file Store in External File", 0, (Fl_Callback*)cb_w_layout_menu_storage3, 0, 136, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, - {"Load...", 0, (Fl_Callback*)cb_w_layout_menu_load, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, - {"Save...", 0, (Fl_Callback*)cb_w_layout_menu_save, 0, 128, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, - {"Delete", 0, (Fl_Callback*)cb_w_layout_menu_delete, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, - {0,0,0,0,0,0,0,0,0} + {"Rename...", 0, (Fl_Callback*)cb_w_layout_menu_rename, nullptr, 128, (uchar)FL_NORMAL_LABEL, 0, 14, 0 }, + {"@fd_beaker FLUID Built-In", 0, (Fl_Callback*)cb_w_layout_menu_storage, nullptr, 9, (uchar)FL_NORMAL_LABEL, 0, 14, 0 }, + {"@fd_user User Preference", 0, (Fl_Callback*)cb_w_layout_menu_storage1, nullptr, 8, (uchar)FL_NORMAL_LABEL, 0, 14, 0 }, + {"@fd_project Store in .fl Project File", 0, (Fl_Callback*)cb_w_layout_menu_storage2, nullptr, 8, (uchar)FL_NORMAL_LABEL, 0, 14, 0 }, + {"@fd_file Store in External File", 0, (Fl_Callback*)cb_w_layout_menu_storage3, nullptr, 136, (uchar)FL_NORMAL_LABEL, 0, 14, 0 }, + {"Load...", 0, (Fl_Callback*)cb_w_layout_menu_load, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0 }, + {"Save...", 0, (Fl_Callback*)cb_w_layout_menu_save, nullptr, 128, (uchar)FL_NORMAL_LABEL, 0, 14, 0 }, + {"Delete", 0, (Fl_Callback*)cb_w_layout_menu_delete, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; -Fl_Button *preset_choice[3]={(Fl_Button *)0}; +Fl_Button* preset_choice[3] = {(Fl_Button*)nullptr}; static void cb_Left(Fl_Value_Input* o, void* v) { if (v == LOAD) { @@ -838,7 +838,7 @@ static void cb_9(Fl_Value_Input* o, void* v) { } } -Fl_Group *w_settings_shell_tab=(Fl_Group *)0; +Fl_Group* w_settings_shell_tab = (Fl_Group*)nullptr; static const unsigned char idata_shell_64[] = {137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,96,0,0,0,64,8,4,0,0,0, @@ -877,14 +877,14 @@ static const unsigned char idata_shell_64[] = 218,229,42,166,70,15,89,225,168,104,12,220,87,226,55,187,91,149,123,50,162,100, 82,219,229,239,135,114,138,14,109,164,201,83,85,44,126,133,81,55,103,232,191,0, 145,21,211,195,226,88,204,195,0,0,0,0,73,69,78,68,174,66,96,130}; -static Fl_Image *image_shell_64() { - static Fl_Image *image = 0L; +static Fl_Image* image_shell_64() { + static Fl_Image* image = nullptr; if (!image) image = new Fl_PNG_Image("shell_64.png", idata_shell_64, 802); return image; } -Fl_Browser *w_settings_shell_list=(Fl_Browser *)0; +Fl_Browser* w_settings_shell_list = (Fl_Browser*)nullptr; static void cb_w_settings_shell_list(Fl_Browser* o, void* v) { if (v == LOAD) { @@ -914,7 +914,7 @@ static void cb_w_settings_shell_list(Fl_Browser* o, void* v) { } } -Fl_Group *w_settings_shell_toolbox=(Fl_Group *)0; +Fl_Group* w_settings_shell_toolbox = (Fl_Group*)nullptr; static void cb_w_settings_shell_toolbox(Fl_Group* o, void* v) { if (v==LOAD) { @@ -943,7 +943,7 @@ static void cb_a(Fl_Button*, void* v) { } } -Fl_Button *w_settings_shell_dup=(Fl_Button *)0; +Fl_Button* w_settings_shell_dup = (Fl_Button*)nullptr; static void cb_w_settings_shell_dup(Fl_Button* o, void* v) { int selected = w_settings_shell_list_selected; @@ -973,7 +973,7 @@ static void cb_w_settings_shell_dup(Fl_Button* o, void* v) { } } -Fl_Button *w_settings_shell_remove=(Fl_Button *)0; +Fl_Button* w_settings_shell_remove = (Fl_Button*)nullptr; static void cb_w_settings_shell_remove(Fl_Button* o, void* v) { int selected = w_settings_shell_list_selected; @@ -1002,7 +1002,7 @@ static void cb_w_settings_shell_remove(Fl_Button* o, void* v) { } } -Fl_Menu_Button *w_settings_shell_menu=(Fl_Menu_Button *)0; +Fl_Menu_Button* w_settings_shell_menu = (Fl_Menu_Button*)nullptr; static void cb_Import(Fl_Menu_*, void* v) { if (v != LOAD) @@ -1015,21 +1015,21 @@ static void cb_Export(Fl_Menu_*, void* v) { } Fl_Menu_Item menu_w_settings_shell_menu[] = { - {"Import...", 0, (Fl_Callback*)cb_Import, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {"Export selected...", 0, (Fl_Callback*)cb_Export, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {"Example Scripts:", 0, 0, 0, 17, (uchar)FL_NORMAL_LABEL, 1, 12, 0}, - {"Compile with fltk-config", 0, 0, 0, 16, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {"Build and run", 0, 0, 0, 16, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {"Build with Xcode on macOS", 0, 0, 0, 16, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {"Build with CMake", 0, 0, 0, 16, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {0,0,0,0,0,0,0,0,0} + {"Import...", 0, (Fl_Callback*)cb_Import, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + {"Export selected...", 0, (Fl_Callback*)cb_Export, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + {"Example Scripts:", 0, nullptr, nullptr, 17, (uchar)FL_NORMAL_LABEL, 1, 12, 0 }, + {"Compile with fltk-config", 0, nullptr, nullptr, 16, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + {"Build and run", 0, nullptr, nullptr, 16, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + {"Build with Xcode on macOS", 0, nullptr, nullptr, 16, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + {"Build with CMake", 0, nullptr, nullptr, 16, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_T(Fl_Button*, void* v) { if (v!=LOAD) show_terminal_window(); } -Fl_Button *w_settings_shell_play=(Fl_Button *)0; +Fl_Button* w_settings_shell_play = (Fl_Button*)nullptr; static void cb_w_settings_shell_play(Fl_Button* o, void* v) { int selected = w_settings_shell_list_selected; @@ -1046,7 +1046,7 @@ static void cb_w_settings_shell_play(Fl_Button* o, void* v) { } } -Fl_Group *w_settings_shell_cmd=(Fl_Group *)0; +Fl_Group* w_settings_shell_cmd = (Fl_Group*)nullptr; static void cb_w_settings_shell_cmd(Fl_Group* o, void* v) { if (v==LOAD) { @@ -1145,9 +1145,9 @@ static void cb_Store(Fl_Choice* o, void* v) { } Fl_Menu_Item menu_Store[] = { - {"@fd_user User Setting", 0, 0, (void*)(fld::Tool_Store::USER), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {"@fd_project Project File", 0, 0, (void*)(fld::Tool_Store::PROJECT), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {0,0,0,0,0,0,0,0,0} + {"@fd_user User Setting", 0, nullptr, (void*)(fld::Tool_Store::USER), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + {"@fd_project Project File", 0, nullptr, (void*)(fld::Tool_Store::PROJECT), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_Condition(Fl_Choice* o, void* v) { @@ -1171,13 +1171,13 @@ static void cb_Condition(Fl_Choice* o, void* v) { } Fl_Menu_Item menu_Condition[] = { - {"all platforms", 0, 0, (void*)(Fd_Shell_Command::ALWAYS), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {"Windows only", 0, 0, (void*)(Fd_Shell_Command::WIN_ONLY), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {"Linux only", 0, 0, (void*)(Fd_Shell_Command::UX_ONLY), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {"macOS only", 0, 0, (void*)(Fd_Shell_Command::MAC_ONLY), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {"Linux and macOS", 0, 0, (void*)(Fd_Shell_Command::MAC_AND_UX_ONLY), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {"don\'t use", 0, 0, (void*)(Fd_Shell_Command::NEVER), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {0,0,0,0,0,0,0,0,0} + {"all platforms", 0, nullptr, (void*)(Fd_Shell_Command::ALWAYS), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + {"Windows only", 0, nullptr, (void*)(Fd_Shell_Command::WIN_ONLY), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + {"Linux only", 0, nullptr, (void*)(Fd_Shell_Command::UX_ONLY), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + {"macOS only", 0, nullptr, (void*)(Fd_Shell_Command::MAC_ONLY), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + {"Linux and macOS", 0, nullptr, (void*)(Fd_Shell_Command::MAC_AND_UX_ONLY), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + {"don\'t use", 0, nullptr, (void*)(Fd_Shell_Command::NEVER), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_Label(Fl_Input* o, void* v) { @@ -1188,7 +1188,7 @@ static void cb_Label(Fl_Input* o, void* v) { } } -Fl_Text_Editor *w_settings_shell_command=(Fl_Text_Editor *)0; +Fl_Text_Editor* w_settings_shell_command = (Fl_Text_Editor*)nullptr; static void cb_w_settings_shell_command(Fl_Text_Editor* o, void* v) { int selected = w_settings_shell_list_selected; @@ -1207,7 +1207,7 @@ static void cb_w_settings_shell_command(Fl_Text_Editor* o, void* v) { } } -Fl_Menu_Button *w_settings_shell_text_macros=(Fl_Menu_Button *)0; +Fl_Menu_Button* w_settings_shell_text_macros = (Fl_Menu_Button*)nullptr; static void cb_w_settings_shell_text_macros(Fl_Menu_Button* o, void*) { const Fl_Menu_Item *mi = o->mvalue(); @@ -1231,19 +1231,19 @@ static void cb_w_settings_shell_text_macros(Fl_Menu_Button* o, void*) { } Fl_Menu_Item menu_w_settings_shell_text_macros[] = { - {"@@BASENAME@@", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0}, - {"@@PROJECTFILE_PATH@@", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0}, - {"@@PROJECTFILE_NAME@@", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0}, - {"@@CODEFILE_PATH@@", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0}, - {"@@CODEFILE_NAME@@", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0}, - {"@@HEADERFILE_PATH@@", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0}, - {"@@HEADERFILE_NAME@@", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0}, - {"@@TEXTFILE_PATH@@", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0}, - {"@@TEXTFILE_NAME@@", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0}, + {"@@BASENAME@@", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0 }, + {"@@PROJECTFILE_PATH@@", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0 }, + {"@@PROJECTFILE_NAME@@", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0 }, + {"@@CODEFILE_PATH@@", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0 }, + {"@@CODEFILE_NAME@@", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0 }, + {"@@HEADERFILE_PATH@@", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0 }, + {"@@HEADERFILE_NAME@@", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0 }, + {"@@TEXTFILE_PATH@@", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0 }, + {"@@TEXTFILE_NAME@@", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0 }, // Not yet implemented - {"@@FLTK_CONFIG@@", 0, 0, 0, 16, (uchar)FL_NORMAL_LABEL, 4, 12, 0}, - {"@@TMPDIR@@", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0}, - {0,0,0,0,0,0,0,0,0} + {"@@FLTK_CONFIG@@", 0, nullptr, nullptr, 16, (uchar)FL_NORMAL_LABEL, 4, 12, 0 }, + {"@@TMPDIR@@", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 4, 12, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_1fd_zoom(Fl_Button*, void*) { @@ -1396,7 +1396,7 @@ static void cb_clear1(Fl_Check_Button* o, void* v) { } } -Fl_Box *w_settings_shell_fd_project=(Fl_Box *)0; +Fl_Box* w_settings_shell_fd_project = (Fl_Box*)nullptr; static const unsigned char idata_fd_project[] = {137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0,0, @@ -1678,14 +1678,14 @@ static const unsigned char idata_fd_project[] = 128,34,228,250,90,246,136,255,29,196,176,206,118,175,58,79,232,226,83,24,236, 213,122,16,176,223,94,207,73,175,70,249,59,81,177,117,128,158,31,49,127,246,30, 207,181,170,20,0,0,0,0,73,69,78,68,174,66,96,130}; -static Fl_Image *image_fd_project() { - static Fl_Image *image = 0L; +static Fl_Image* image_fd_project() { + static Fl_Image* image = nullptr; if (!image) image = new Fl_PNG_Image("fd_project.png", idata_fd_project, 6950); return image; } -Fl_Box *w_settings_shell_fd_user=(Fl_Box *)0; +Fl_Box* w_settings_shell_fd_user = (Fl_Box*)nullptr; static const unsigned char idata_fd_user[] = {137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0,0, @@ -2043,14 +2043,14 @@ static const unsigned char idata_fd_user[] = 163,124,159,80,105,166,84,154,25,123,221,51,105,57,150,247,65,216,203,236,81, 116,89,108,93,41,107,255,5,119,155,194,247,64,241,254,70,0,0,0,0,73,69,78,68, 174,66,96,130}; -static Fl_Image *image_fd_user() { - static Fl_Image *image = 0L; +static Fl_Image* image_fd_user() { + static Fl_Image* image = nullptr; if (!image) image = new Fl_PNG_Image("fd_user.png", idata_fd_user, 8612); return image; } -Fl_Group *w_settings_i18n_tab=(Fl_Group *)0; +Fl_Group* w_settings_i18n_tab = (Fl_Group*)nullptr; static void cb_w_settings_i18n_tab(Fl_Group* o, void* v) { propagate_load(o, v); @@ -2122,29 +2122,29 @@ static const unsigned char idata_language_64[] = 180,48,231,36,244,177,224,90,26,54,107,106,126,27,146,219,190,14,94,52,11,64,38, 157,33,48,255,61,163,226,212,114,146,206,17,166,130,48,126,136,23,88,161,222, 205,191,56,75,123,84,202,251,159,166,0,0,0,0,73,69,78,68,174,66,96,130}; -static Fl_Image *image_language_64() { - static Fl_Image *image = 0L; +static Fl_Image* image_language_64() { + static Fl_Image* image = nullptr; if (!image) image = new Fl_PNG_Image("language_64.png", idata_language_64, 1450); return image; } -Fl_Choice *i18n_type_chooser=(Fl_Choice *)0; +Fl_Choice* i18n_type_chooser = (Fl_Choice*)nullptr; Fl_Menu_Item menu_i18n_type_chooser[] = { - {"None", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {"GNU gettext", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {"POSIX catgets", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0}, - {0,0,0,0,0,0,0,0,0} + {"None", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + {"GNU gettext", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + {"POSIX catgets", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; -Fl_Group *i18n_gnu_group=(Fl_Group *)0; +Fl_Group* i18n_gnu_group = (Fl_Group*)nullptr; static void cb_i18n_gnu_group(Fl_Group* o, void* v) { propagate_load(o, v); } -Fl_Input *i18n_gnu_include_input=(Fl_Input *)0; +Fl_Input* i18n_gnu_include_input = (Fl_Input*)nullptr; static void cb_i18n_gnu_include_input(Fl_Input* o, void* v) { if (v == LOAD) { @@ -2156,7 +2156,7 @@ static void cb_i18n_gnu_include_input(Fl_Input* o, void* v) { } } -Fl_Input *i18n_gnu_conditional_input=(Fl_Input *)0; +Fl_Input* i18n_gnu_conditional_input = (Fl_Input*)nullptr; static void cb_i18n_gnu_conditional_input(Fl_Input* o, void* v) { if (v == LOAD) { @@ -2168,7 +2168,7 @@ static void cb_i18n_gnu_conditional_input(Fl_Input* o, void* v) { } } -Fl_Input *i18n_gnu_function_input=(Fl_Input *)0; +Fl_Input* i18n_gnu_function_input = (Fl_Input*)nullptr; static void cb_i18n_gnu_function_input(Fl_Input* o, void* v) { if (v == LOAD) { @@ -2180,7 +2180,7 @@ static void cb_i18n_gnu_function_input(Fl_Input* o, void* v) { } } -Fl_Input *i18n_gnu_static_function_input=(Fl_Input *)0; +Fl_Input* i18n_gnu_static_function_input = (Fl_Input*)nullptr; static void cb_i18n_gnu_static_function_input(Fl_Input* o, void* v) { if (v == LOAD) { @@ -2192,13 +2192,13 @@ static void cb_i18n_gnu_static_function_input(Fl_Input* o, void* v) { } } -Fl_Group *i18n_posix_group=(Fl_Group *)0; +Fl_Group* i18n_posix_group = (Fl_Group*)nullptr; static void cb_i18n_posix_group(Fl_Group* o, void* v) { propagate_load(o, v); } -Fl_Input *i18n_pos_include_input=(Fl_Input *)0; +Fl_Input* i18n_pos_include_input = (Fl_Input*)nullptr; static void cb_i18n_pos_include_input(Fl_Input* o, void* v) { if (v == LOAD) { @@ -2210,7 +2210,7 @@ static void cb_i18n_pos_include_input(Fl_Input* o, void* v) { } } -Fl_Input *i18n_pos_conditional_input=(Fl_Input *)0; +Fl_Input* i18n_pos_conditional_input = (Fl_Input*)nullptr; static void cb_i18n_pos_conditional_input(Fl_Input* o, void* v) { if (v == LOAD) { @@ -2222,7 +2222,7 @@ static void cb_i18n_pos_conditional_input(Fl_Input* o, void* v) { } } -Fl_Input *i18n_pos_file_input=(Fl_Input *)0; +Fl_Input* i18n_pos_file_input = (Fl_Input*)nullptr; static void cb_i18n_pos_file_input(Fl_Input* o, void* v) { if (v == LOAD) { @@ -2238,7 +2238,7 @@ static void cb_c(Fl_Group* o, void* v) { propagate_load(o, v); } -Fl_Int_Input *i18n_pos_set_input=(Fl_Int_Input *)0; +Fl_Int_Input* i18n_pos_set_input = (Fl_Int_Input*)nullptr; static void cb_i18n_pos_set_input(Fl_Int_Input* o, void* v) { if (v == LOAD) { @@ -2250,7 +2250,7 @@ static void cb_i18n_pos_set_input(Fl_Int_Input* o, void* v) { } } -Fl_Group *w_settings_user_tab=(Fl_Group *)0; +Fl_Group* w_settings_user_tab = (Fl_Group*)nullptr; static void cb_w_settings_user_tab(Fl_Group* o, void* v) { propagate_load(o, v); @@ -2435,14 +2435,14 @@ static const unsigned char idata_user_circle_64[] = 215,142,106,151,251,157,208,10,130,166,184,54,228,186,116,115,206,83,27,179,121, 252,106,89,247,128,255,3,60,207,245,248,165,38,113,147,0,0,0,0,73,69,78,68,174, 66,96,130}; -static Fl_Image *image_user_circle_64() { - static Fl_Image *image = 0L; +static Fl_Image* image_user_circle_64() { + static Fl_Image* image = nullptr; if (!image) image = new Fl_PNG_Image("user_circle_64.png", idata_user_circle_64, 3909); return image; } -Fl_Choice *w_settings_user_commenttext=(Fl_Choice *)0; +Fl_Choice* w_settings_user_commenttext = (Fl_Choice*)nullptr; static void cb_Reset(Fl_Button* o, void* v) { if (v == LOAD) return; @@ -3598,16 +3598,16 @@ Fl_Double_Window* make_settings_window() { return settings_window; } -Fl_Double_Window *shell_run_window=(Fl_Double_Window *)0; +Fl_Double_Window* shell_run_window = (Fl_Double_Window*)nullptr; -Fl_Terminal *shell_run_terminal=(Fl_Terminal *)0; +Fl_Terminal* shell_run_terminal = (Fl_Terminal*)nullptr; static void cb_Clear(Fl_Button*, void*) { // clear screen, clear scrollback, home cursor shell_run_terminal->append("\033[2J\033[3J\033[H"); } -Fl_Return_Button *shell_run_button=(Fl_Return_Button *)0; +Fl_Return_Button* shell_run_button = (Fl_Return_Button*)nullptr; static void cb_shell_run_button(Fl_Return_Button*, void*) { Fl_Preferences pos(Fluid.preferences, "shell_run_Window_pos"); diff --git a/fluid/panels/settings_panel.h b/fluid/panels/settings_panel.h index 808f544f3..bba128296 100644 --- a/fluid/panels/settings_panel.h +++ b/fluid/panels/settings_panel.h @@ -33,96 +33,96 @@ extern void i18n_cb(Fl_Choice *,void *); extern void scheme_cb(Fl_Scheme_Choice *, void *); extern int w_settings_shell_list_selected; #include -extern Fl_Double_Window *script_panel; +extern Fl_Double_Window* script_panel; #include -extern Fl_Text_Editor *script_input; +extern Fl_Text_Editor* script_input; #include extern void propagate_load(Fl_Group*, void*); #include -extern Fl_Button *script_panel_cancel; +extern Fl_Button* script_panel_cancel; #include -extern Fl_Return_Button *script_panel_ok; +extern Fl_Return_Button* script_panel_ok; #include Fl_Double_Window* make_script_panel(); -extern Fl_Double_Window *settings_window; +extern Fl_Double_Window* settings_window; #include -extern Fl_Tabs *w_settings_tabs; -extern Fl_Group *w_settings_general_tab; -extern Fl_Scheme_Choice *scheme_choice; +extern Fl_Tabs* w_settings_tabs; +extern Fl_Group* w_settings_general_tab; +extern Fl_Scheme_Choice* scheme_choice; #include -extern Fl_Check_Button *tooltips_button; -extern Fl_Check_Button *completion_button; -extern Fl_Check_Button *openlast_button; -extern Fl_Check_Button *prevpos_button; -extern Fl_Check_Button *show_comments_button; +extern Fl_Check_Button* tooltips_button; +extern Fl_Check_Button* completion_button; +extern Fl_Check_Button* openlast_button; +extern Fl_Check_Button* prevpos_button; +extern Fl_Check_Button* show_comments_button; #include -extern Fl_Spinner *recent_spinner; +extern Fl_Spinner* recent_spinner; #include -extern Fl_Input *editor_command_input; -extern Fl_Check_Button *use_external_editor_button; +extern Fl_Input* editor_command_input; +extern Fl_Check_Button* use_external_editor_button; extern void toggle_guides_cb(Fl_Check_Button*, void*); -extern Fl_Check_Button *guides_button; +extern Fl_Check_Button* guides_button; extern void toggle_restricted_cb(Fl_Check_Button*, void*); -extern Fl_Check_Button *restricted_button; +extern Fl_Check_Button* restricted_button; extern void toggle_ghosted_outline_cb(Fl_Check_Button*, void*); -extern Fl_Check_Button *ghosted_outline_button; -extern Fl_Group *w_settings_project_tab; -extern Fl_Input *header_file_input; -extern Fl_Input *code_file_input; -extern Fl_Check_Button *include_H_from_C_button; -extern Fl_Input *include_guard_input; -extern Fl_Check_Button *use_FL_COMMAND_button; -extern Fl_Check_Button *utf8_in_src_button; -extern Fl_Check_Button *avoid_early_includes_button; -extern Fl_Check_Button *w_proj_mergeback; -extern Fl_Group *w_settings_layout_tab; +extern Fl_Check_Button* ghosted_outline_button; +extern Fl_Group* w_settings_project_tab; +extern Fl_Input* header_file_input; +extern Fl_Input* code_file_input; +extern Fl_Check_Button* include_H_from_C_button; +extern Fl_Input* include_guard_input; +extern Fl_Check_Button* use_FL_COMMAND_button; +extern Fl_Check_Button* utf8_in_src_button; +extern Fl_Check_Button* avoid_early_includes_button; +extern Fl_Check_Button* w_proj_mergeback; +extern Fl_Group* w_settings_layout_tab; #include -extern Fl_Choice *layout_choice; +extern Fl_Choice* layout_choice; #include -extern Fl_Menu_Button *w_layout_menu; +extern Fl_Menu_Button* w_layout_menu; #include extern void edit_layout_preset_cb(Fl_Button*, void*); -extern Fl_Button *preset_choice[3]; +extern Fl_Button* preset_choice[3]; #include extern Fl_Menu_Item fontmenu_w_default[]; -extern Fl_Group *w_settings_shell_tab; +extern Fl_Group* w_settings_shell_tab; #include -extern Fl_Browser *w_settings_shell_list; -extern Fl_Group *w_settings_shell_toolbox; -extern Fl_Button *w_settings_shell_dup; -extern Fl_Button *w_settings_shell_remove; -extern Fl_Menu_Button *w_settings_shell_menu; -extern Fl_Button *w_settings_shell_play; -extern Fl_Group *w_settings_shell_cmd; +extern Fl_Browser* w_settings_shell_list; +extern Fl_Group* w_settings_shell_toolbox; +extern Fl_Button* w_settings_shell_dup; +extern Fl_Button* w_settings_shell_remove; +extern Fl_Menu_Button* w_settings_shell_menu; +extern Fl_Button* w_settings_shell_play; +extern Fl_Group* w_settings_shell_cmd; #include -extern Fl_Text_Editor *w_settings_shell_command; -extern Fl_Menu_Button *w_settings_shell_text_macros; -extern Fl_Box *w_settings_shell_fd_project; -extern Fl_Box *w_settings_shell_fd_user; -extern Fl_Group *w_settings_i18n_tab; +extern Fl_Text_Editor* w_settings_shell_command; +extern Fl_Menu_Button* w_settings_shell_text_macros; +extern Fl_Box* w_settings_shell_fd_project; +extern Fl_Box* w_settings_shell_fd_user; +extern Fl_Group* w_settings_i18n_tab; extern void i18n_type_cb(Fl_Choice*, void*); -extern Fl_Choice *i18n_type_chooser; -extern Fl_Group *i18n_gnu_group; -extern Fl_Input *i18n_gnu_include_input; -extern Fl_Input *i18n_gnu_conditional_input; -extern Fl_Input *i18n_gnu_function_input; -extern Fl_Input *i18n_gnu_static_function_input; -extern Fl_Group *i18n_posix_group; -extern Fl_Input *i18n_pos_include_input; -extern Fl_Input *i18n_pos_conditional_input; -extern Fl_Input *i18n_pos_file_input; +extern Fl_Choice* i18n_type_chooser; +extern Fl_Group* i18n_gnu_group; +extern Fl_Input* i18n_gnu_include_input; +extern Fl_Input* i18n_gnu_conditional_input; +extern Fl_Input* i18n_gnu_function_input; +extern Fl_Input* i18n_gnu_static_function_input; +extern Fl_Group* i18n_posix_group; +extern Fl_Input* i18n_pos_include_input; +extern Fl_Input* i18n_pos_conditional_input; +extern Fl_Input* i18n_pos_file_input; #include -extern Fl_Int_Input *i18n_pos_set_input; +extern Fl_Int_Input* i18n_pos_set_input; #include -extern Fl_Group *w_settings_user_tab; +extern Fl_Group* w_settings_user_tab; extern Fl_Menu_Item fontmenu[]; extern Fl_Menu_Item colormenu[]; -extern Fl_Choice *w_settings_user_commenttext; +extern Fl_Choice* w_settings_user_commenttext; Fl_Double_Window* make_settings_window(); extern Fl_Menu_Item menu_layout_choice[]; extern Fl_Menu_Item menu_w_layout_menu[]; #define w_layout_menu_rename (menu_w_layout_menu+0) -extern Fl_Menu_Item *w_layout_menu_storage[4]; +extern Fl_Menu_Item* w_layout_menu_storage[4]; #define w_layout_menu_load (menu_w_layout_menu+5) #define w_layout_menu_save (menu_w_layout_menu+6) #define w_layout_menu_delete (menu_w_layout_menu+7) @@ -131,9 +131,9 @@ extern Fl_Menu_Item menu_Store[]; extern Fl_Menu_Item menu_Condition[]; extern Fl_Menu_Item menu_w_settings_shell_text_macros[]; extern Fl_Menu_Item menu_i18n_type_chooser[]; -extern Fl_Double_Window *shell_run_window; +extern Fl_Double_Window* shell_run_window; #include -extern Fl_Terminal *shell_run_terminal; -extern Fl_Return_Button *shell_run_button; +extern Fl_Terminal* shell_run_terminal; +extern Fl_Return_Button* shell_run_button; Fl_Double_Window* make_shell_window(); #endif diff --git a/fluid/panels/template_panel.cxx b/fluid/panels/template_panel.cxx index 7c2a9ac2b..090fbb662 100644 --- a/fluid/panels/template_panel.cxx +++ b/fluid/panels/template_panel.cxx @@ -33,7 +33,7 @@ #include #endif // _WIN32 && !__CYGWIN__ -Fl_Double_Window *template_panel=(Fl_Double_Window *)0; +Fl_Double_Window* template_panel = (Fl_Double_Window*)nullptr; static void cb_template_panel(Fl_Double_Window*, void*) { Fl_Shared_Image *img = (Fl_Shared_Image *)template_preview->image(); @@ -46,7 +46,7 @@ static void cb_template_panel(Fl_Double_Window*, void*) { template_panel->hide(); } -Fl_Browser *template_browser=(Fl_Browser *)0; +Fl_Browser* template_browser = (Fl_Browser*)nullptr; static void cb_template_browser(Fl_Browser*, void*) { if (Fl::event_clicks()) { @@ -95,9 +95,9 @@ static void cb_template_browser(Fl_Browser*, void*) { } } -Fl_Box *template_preview=(Fl_Box *)0; +Fl_Box* template_preview = (Fl_Box*)nullptr; -Fl_Input *template_name=(Fl_Input *)0; +Fl_Input* template_name = (Fl_Input*)nullptr; static void cb_template_name(Fl_Input*, void*) { if (strlen(template_name->value())) { @@ -106,9 +106,9 @@ static void cb_template_name(Fl_Input*, void*) { } else template_submit->deactivate(); } -Fl_Input *template_instance=(Fl_Input *)0; +Fl_Input* template_instance = (Fl_Input*)nullptr; -Fl_Button *template_delete=(Fl_Button *)0; +Fl_Button* template_delete = (Fl_Button*)nullptr; static void cb_Cancel(Fl_Button*, void*) { Fl_Shared_Image *img = (Fl_Shared_Image *)template_preview->image(); @@ -121,7 +121,7 @@ static void cb_Cancel(Fl_Button*, void*) { template_panel->hide(); } -Fl_Return_Button *template_submit=(Fl_Return_Button *)0; +Fl_Return_Button* template_submit = (Fl_Return_Button*)nullptr; static void cb_template_submit(Fl_Return_Button*, void*) { Fl_Shared_Image *img = (Fl_Shared_Image *)template_preview->image(); diff --git a/fluid/panels/template_panel.h b/fluid/panels/template_panel.h index 172e4c7de..7b1f87b7e 100644 --- a/fluid/panels/template_panel.h +++ b/fluid/panels/template_panel.h @@ -20,19 +20,19 @@ #define template_panel_h #include #include -extern Fl_Double_Window *template_panel; +extern Fl_Double_Window* template_panel; #include -extern Fl_Browser *template_browser; +extern Fl_Browser* template_browser; #include -extern Fl_Box *template_preview; +extern Fl_Box* template_preview; #include -extern Fl_Input *template_name; -extern Fl_Input *template_instance; +extern Fl_Input* template_name; +extern Fl_Input* template_instance; #include #include -extern Fl_Button *template_delete; +extern Fl_Button* template_delete; #include -extern Fl_Return_Button *template_submit; +extern Fl_Return_Button* template_submit; Fl_Double_Window* make_template_panel(); void template_clear(); void template_delete_cb(Fl_Button *, void *); diff --git a/fluid/panels/widget_panel.cxx b/fluid/panels/widget_panel.cxx index 3434533d5..256b24f0d 100644 --- a/fluid/panels/widget_panel.cxx +++ b/fluid/panels/widget_panel.cxx @@ -89,20 +89,20 @@ static void update_current(Fl_Text_Editor* o, void *v, //fl ▲ ----------~~-=-~=--=-=----------~-~~=-~-~~-~~==~~--=~- ▲ fl// } -Fl_Double_Window *image_panel_window=(Fl_Double_Window *)0; +Fl_Double_Window* image_panel_window = (Fl_Double_Window*)nullptr; static void cb_image_panel_window(Fl_Double_Window* o, void* v) { -//fl ▼ ---------------------- callback ~-=--=~~=~=~~--==-=~~- ▼ fl// +//fl ▼ ---------------------- callback ~~=~---~-----==~~-=-=~ ▼ fl// propagate_load(o, v); //fl ▲ ----------~=-~=-=--=~------------~~----=--~=~~-~-----= ▲ fl// } -Fl_Group *image_panel_imagegroup=(Fl_Group *)0; +Fl_Group* image_panel_imagegroup = (Fl_Group*)nullptr; -Fl_Box *image_panel_data=(Fl_Box *)0; +Fl_Box* image_panel_data = (Fl_Box*)nullptr; static void cb_image_panel_data(Fl_Box* o, void* v) { -//fl ▼ ---------------------- callback -~-~--~-~~-~-~~~----~= ▼ fl// +//fl ▼ ---------------------- callback ~-~==-=~~-~-=~~--~~==- ▼ fl// if (v == LOAD) { Fl_Shared_Image *img = Fl_Shared_Image::get(widget_image_input->value()); o->user_data(img); @@ -122,10 +122,10 @@ static void cb_image_panel_data(Fl_Box* o, void* v) { //fl ▲ ----------=~-=-~-~---~-----------~=--~~~-~~=--~-=--=-= ▲ fl// } -fld::widget::Formula_Input *image_panel_imagew=(fld::widget::Formula_Input *)0; +fld::widget::Formula_Input* image_panel_imagew = (fld::widget::Formula_Input*)nullptr; static void cb_image_panel_imagew(fld::widget::Formula_Input* o, void* v) { -//fl ▼ ---------------------- callback ~~--~=---~-~=-=~~~-~~- ▼ fl// +//fl ▼ ---------------------- callback ---==-=~~~~~-~-=~=-~~- ▼ fl// if (v == LOAD) { if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) { o->value(current_widget->scale_image_w_); @@ -154,10 +154,10 @@ static void cb_image_panel_imagew(fld::widget::Formula_Input* o, void* v) { //fl ▲ ----------~==~=~-~~=~~----------~-~-=-=~~-~=~~-~=~~-~- ▲ fl// } -fld::widget::Formula_Input *image_panel_imageh=(fld::widget::Formula_Input *)0; +fld::widget::Formula_Input* image_panel_imageh = (fld::widget::Formula_Input*)nullptr; static void cb_image_panel_imageh(fld::widget::Formula_Input* o, void* v) { -//fl ▼ ---------------------- callback ~-~=-~~-=-=~~~--~----= ▼ fl// +//fl ▼ ---------------------- callback ~~~=----~=~-~=~~--=~~- ▼ fl// if (v == LOAD) { if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) { o->value(current_widget->scale_image_h_); @@ -237,12 +237,12 @@ static void cb_bind(Fl_Check_Button* o, void* v) { //fl ▲ ----------~=~=-~~--=~~-------------==-~=~~=~=~----~~=~ ▲ fl// } -Fl_Group *image_panel_deimagegroup=(Fl_Group *)0; +Fl_Group* image_panel_deimagegroup = (Fl_Group*)nullptr; -Fl_Box *image_panel_dedata=(Fl_Box *)0; +Fl_Box* image_panel_dedata = (Fl_Box*)nullptr; static void cb_image_panel_dedata(Fl_Box* o, void* v) { -//fl ▼ ---------------------- callback ~---~=~~-~-=---~=~~==- ▼ fl// +//fl ▼ ---------------------- callback -~---=~~~=-~-~~~=-=~~~ ▼ fl// if (v == LOAD) { Fl_Shared_Image *img = Fl_Shared_Image::get(widget_deimage_input->value()); o->user_data(img); @@ -262,10 +262,10 @@ static void cb_image_panel_dedata(Fl_Box* o, void* v) { //fl ▲ ----------~=~=-~~---=~------------~~=-~~=-=-=~=~--=--~ ▲ fl// } -fld::widget::Formula_Input *image_panel_deimagew=(fld::widget::Formula_Input *)0; +fld::widget::Formula_Input* image_panel_deimagew = (fld::widget::Formula_Input*)nullptr; static void cb_image_panel_deimagew(fld::widget::Formula_Input* o, void* v) { -//fl ▼ ---------------------- callback ~~--=~=~=~=~-=~--=~~=- ▼ fl// +//fl ▼ ---------------------- callback ---=~~~~~=-=-~=~~=--=~ ▼ fl// if (v == LOAD) { if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) { o->value(current_widget->scale_deimage_w_); @@ -294,10 +294,10 @@ static void cb_image_panel_deimagew(fld::widget::Formula_Input* o, void* v) { //fl ▲ ----------~=-~--=-=~=~----------~-~-~~--~~-=-==~~==-~= ▲ fl// } -fld::widget::Formula_Input *image_panel_deimageh=(fld::widget::Formula_Input *)0; +fld::widget::Formula_Input* image_panel_deimageh = (fld::widget::Formula_Input*)nullptr; static void cb_image_panel_deimageh(fld::widget::Formula_Input* o, void* v) { -//fl ▼ ---------------------- callback ~~=-=---~-~~-=-=~-~--- ▼ fl// +//fl ▼ ---------------------- callback -----==-~==~=-=~=--~-= ▼ fl// if (v == LOAD) { if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) { o->value(current_widget->scale_deimage_h_); @@ -377,10 +377,10 @@ static void cb_bind1(Fl_Check_Button* o, void* v) { //fl ▲ ----------=~-=~-~~-~~-----------~--==~--=~-=~~-~=~---= ▲ fl// } -Fl_Button *image_panel_close=(Fl_Button *)0; +Fl_Button* image_panel_close = (Fl_Button*)nullptr; static void cb_image_panel_close(Fl_Button*, void* v) { -//fl ▼ ---------------------- callback ~~-=~-~--~---=~-=---=- ▼ fl// +//fl ▼ ---------------------- callback ~~-=-==~=~~~~~=~--~=~- ▼ fl// if (v != LOAD) image_panel_window->hide(); //fl ▲ ----------=~-=~~-~~=------------~--==~-=~~~=~=~~-==~=- ▲ fl// @@ -601,31 +601,31 @@ void flex_margin_cb(Fl_Value_Input* i, void* v, void (*load_margin)(Fl_Flex*,Fl_ //fl ▲ ----------~---=--~~=-~-----------~~--~~~=~=-~==~~==-~~ ▲ fl// } -Fl_Wizard *tabs_wizard=(Fl_Wizard *)0; +Fl_Wizard* tabs_wizard = (Fl_Wizard*)nullptr; static void cb_tabs_wizard(Fl_Wizard* o, void* v) { -//fl ▼ ---------------------- callback -~-=-~=-~~---~-=-~~~-~ ▼ fl// +//fl ▼ ---------------------- callback ~~~==~-=~~=~--~~~~~=~- ▼ fl// propagate_load((Fl_Group *)o,v); //fl ▲ ----------~=~=~--~=~=~----------~--~-==~~-=-=~=-~=~~=- ▲ fl// } -Fl_Tabs *widget_tabs=(Fl_Tabs *)0; +Fl_Tabs* widget_tabs = (Fl_Tabs*)nullptr; static void cb_widget_tabs(Fl_Tabs* o, void* v) { -//fl ▼ ---------------------- callback --~-~~=~~==----==--~-~ ▼ fl// +//fl ▼ ---------------------- callback ~~~=-=--=--~~-~=-=---- ▼ fl// if (current_widget) propagate_load((Fl_Group *)o,v); //fl ▲ ----------=~-==~---=------------~-~~~~-==--==--~~--~=~ ▲ fl// } -Fl_Group *wp_gui_tab=(Fl_Group *)0; +Fl_Group* wp_gui_tab = (Fl_Group*)nullptr; -Fl_Input *wp_gui_label=(Fl_Input *)0; +Fl_Input* wp_gui_label = (Fl_Input*)nullptr; -Fl_Input *widget_image_input=(Fl_Input *)0; +Fl_Input* widget_image_input = (Fl_Input*)nullptr; static void cb_widget_image_input(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback --~-------=~=~~==~-=~~ ▼ fl// +//fl ▼ ---------------------- callback ---~=~=~=~~-~~-~-~~~=~ ▼ fl// if (v == LOAD) { if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) { o->activate(); @@ -672,10 +672,10 @@ static void cb_(Fl_Button*, void* v) { //fl ▲ ----------~=-==~~-~-~=----------~~-~~--~~-=~--=-=~~=~- ▲ fl// } -Fl_Input *widget_deimage_input=(Fl_Input *)0; +Fl_Input* widget_deimage_input = (Fl_Input*)nullptr; static void cb_widget_deimage_input(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback ~~=-~=-=-------~-~~-=~ ▼ fl// +//fl ▼ ---------------------- callback ~~=-~~~~--~~-~--=~-=~= ▼ fl// if (v == LOAD) { if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) { o->activate(); @@ -714,41 +714,41 @@ static void cb_Browse1(Fl_Button* o, void* v) { //fl ▲ ----------=~---==---=~-----------~~~-~-~~=-=~==-~--~-- ▲ fl// } -Fl_Group *wp_gui_alignment=(Fl_Group *)0; +Fl_Group* wp_gui_alignment = (Fl_Group*)nullptr; Fl_Menu_Item menu_[] = { - {" Image Alignment ", 0, 0, (void*)((fl_intptr_t)-1), 0, (uchar)FL_NORMAL_LABEL, 1, 10, 0}, - {"image over text", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_IMAGE_OVER_TEXT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"text over image", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TEXT_OVER_IMAGE), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"text next to image", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TEXT_NEXT_TO_IMAGE), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"image next to text", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_IMAGE_NEXT_TO_TEXT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"image is backdrop", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_IMAGE_BACKDROP), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {0,0,0,0,0,0,0,0,0} + {" Image Alignment ", 0, nullptr, (void*)((fl_intptr_t)-1), 0, (uchar)FL_NORMAL_LABEL, 1, 10, 0 }, + {"image over text", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_IMAGE_OVER_TEXT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"text over image", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_TEXT_OVER_IMAGE), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"text next to image", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_TEXT_NEXT_TO_IMAGE), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"image next to text", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_IMAGE_NEXT_TO_TEXT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"image is backdrop", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_IMAGE_BACKDROP), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; Fl_Menu_Item menu_1[] = { - {" Inside && Outside ", 0, 0, (void*)((fl_intptr_t)-1), 0, (uchar)FL_NORMAL_LABEL, 1, 10, 0}, - {"top left", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TOP_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"top", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"top right", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TOP_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"left", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"center", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_CENTER), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"right", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"bottom left", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"bottom", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"bottom right", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {" Outside Alignment ", 0, 0, (void*)((fl_intptr_t)-1), 0, (uchar)FL_NORMAL_LABEL, 1, 10, 0}, - {"left top", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_LEFT_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"right top", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_RIGHT_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"left bottom", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_LEFT_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {"right bottom", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_RIGHT_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0}, - {0,0,0,0,0,0,0,0,0} + {" Inside && Outside ", 0, nullptr, (void*)((fl_intptr_t)-1), 0, (uchar)FL_NORMAL_LABEL, 1, 10, 0 }, + {"top left", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_TOP_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"top", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"top right", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_TOP_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"left", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"center", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_CENTER), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"right", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"bottom left", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"bottom", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"bottom right", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {" Outside Alignment ", 0, nullptr, (void*)((fl_intptr_t)-1), 0, (uchar)FL_NORMAL_LABEL, 1, 10, 0 }, + {"left top", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_LEFT_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"right top", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_RIGHT_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"left bottom", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_LEFT_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + {"right bottom", 0, nullptr, (void*)((fl_intptr_t)FL_ALIGN_RIGHT_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; -fld::widget::Formula_Input *widget_x_input=(fld::widget::Formula_Input *)0; +fld::widget::Formula_Input* widget_x_input = (fld::widget::Formula_Input*)nullptr; static void cb_widget_x_input(fld::widget::Formula_Input* o, void* v) { -//fl ▼ ---------------------- callback ~~=-~~~~~~=-~-~~----~- ▼ fl// +//fl ▼ ---------------------- callback ~~~--=~-~=-~~--~~=~~~= ▼ fl// if (v == LOAD) { if (current_widget->is_true_widget()) { o->value(((Widget_Node *)current_widget)->o->x()); @@ -779,10 +779,10 @@ static void cb_widget_x_input(fld::widget::Formula_Input* o, void* v) { //fl ▲ ----------=~=~--~~-=-~----------~~=~=--~~~-=~=~-=~~==- ▲ fl// } -fld::widget::Formula_Input *widget_y_input=(fld::widget::Formula_Input *)0; +fld::widget::Formula_Input* widget_y_input = (fld::widget::Formula_Input*)nullptr; static void cb_widget_y_input(fld::widget::Formula_Input* o, void* v) { -//fl ▼ ---------------------- callback ~~--~=--~-~=-~=~~~=~~= ▼ fl// +//fl ▼ ---------------------- callback ---==~=~~~~=-=---=--~= ▼ fl// if (v == LOAD) { if (current_widget->is_true_widget()) { o->value(((Widget_Node *)current_widget)->o->y()); @@ -812,10 +812,10 @@ static void cb_widget_y_input(fld::widget::Formula_Input* o, void* v) { //fl ▲ ----------~==--=~=--=-----------~~=~--~~=~-~---=~-=-~= ▲ fl// } -fld::widget::Formula_Input *widget_w_input=(fld::widget::Formula_Input *)0; +fld::widget::Formula_Input* widget_w_input = (fld::widget::Formula_Input*)nullptr; static void cb_widget_w_input(fld::widget::Formula_Input* o, void* v) { -//fl ▼ ---------------------- callback ---=~~--~==-=-~-=-~-=~ ▼ fl// +//fl ▼ ---------------------- callback ~~~=---=-=-~-==----=~= ▼ fl// if (v == LOAD) { if (current_widget->is_true_widget()) { o->value(((Widget_Node *)current_widget)->o->w()); @@ -845,10 +845,10 @@ static void cb_widget_w_input(fld::widget::Formula_Input* o, void* v) { //fl ▲ ----------~=~-=~~--~------------~--~-==-~~~~~==-=--=-= ▲ fl// } -fld::widget::Formula_Input *widget_h_input=(fld::widget::Formula_Input *)0; +fld::widget::Formula_Input* widget_h_input = (fld::widget::Formula_Input*)nullptr; static void cb_widget_h_input(fld::widget::Formula_Input* o, void* v) { -//fl ▼ ---------------------- callback -~-=-==~--~=-~--=----- ▼ fl// +//fl ▼ ---------------------- callback ~-=~~-~-=~=--=-~=-~==~ ▼ fl// if (v == LOAD) { if (current_widget->is_true_widget()) { o->value(((Widget_Node *)current_widget)->o->h()); @@ -903,16 +903,16 @@ static void cb_Children(Fl_Choice* o, void* v) { } Fl_Menu_Item menu_Children[] = { - {"Fixed", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"Reposition", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"Resize", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {0,0,0,0,0,0,0,0,0} + {"Fixed", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"Reposition", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"Resize", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; -Fl_Group *wp_gui_flexp=(Fl_Group *)0; +Fl_Group* wp_gui_flexp = (Fl_Group*)nullptr; static void cb_wp_gui_flexp(Fl_Group* o, void* v) { -//fl ▼ ---------------------- callback --~~~~~-=~~-~-~----~-= ▼ fl// +//fl ▼ ---------------------- callback ---==~-~~=~-~--=~~~-=~ ▼ fl// if (v == LOAD) { if (Flex_Node::parent_is_flex(current_widget)) { o->show(); @@ -924,10 +924,10 @@ static void cb_wp_gui_flexp(Fl_Group* o, void* v) { //fl ▲ ----------~=---=-=~~-=------------=-~=-~-==-~~~-~-=~~~ ▲ fl// } -Fl_Value_Input *widget_flex_size=(Fl_Value_Input *)0; +Fl_Value_Input* widget_flex_size = (Fl_Value_Input*)nullptr; static void cb_widget_flex_size(Fl_Value_Input* o, void* v) { -//fl ▼ ---------------------- callback ---~-~=~~=-~=~~-~--~-= ▼ fl// +//fl ▼ ---------------------- callback ~~~--~~-~=-~-~-=-~-~=- ▼ fl// if (v == LOAD) { if (Flex_Node::parent_is_flex(current_widget)) { o->value(Flex_Node::size(current_widget)); @@ -963,10 +963,10 @@ static void cb_widget_flex_size(Fl_Value_Input* o, void* v) { //fl ▲ ----------~=~~-~-=~-=~----------~~~=~~--~=-~--~==--~~~ ▲ fl// } -Fl_Check_Button *widget_flex_fixed=(Fl_Check_Button *)0; +Fl_Check_Button* widget_flex_fixed = (Fl_Check_Button*)nullptr; static void cb_widget_flex_fixed(Fl_Check_Button* o, void* v) { -//fl ▼ ---------------------- callback ~~-==--~--~~-~=~-=~=~- ▼ fl// +//fl ▼ ---------------------- callback --~=~=~~--~~-~-==~-~-= ▼ fl// if (v == LOAD) { if (Flex_Node::parent_is_flex(current_widget)) { o->value(Flex_Node::is_fixed(current_widget)); @@ -999,10 +999,10 @@ static void cb_widget_flex_fixed(Fl_Check_Button* o, void* v) { //fl ▲ ----------~==-=-~=---=----------~--~=---~~~=~~-~~-~--= ▲ fl// } -Fl_Group *wp_gui_values=(Fl_Group *)0; +Fl_Group* wp_gui_values = (Fl_Group*)nullptr; static void cb_wp_gui_values(Fl_Group* o, void* v) { -//fl ▼ ---------------------- callback ~~~~=~-=-==~--~=~==-~- ▼ fl// +//fl ▼ ---------------------- callback --=~-~=~--~-~=~~=~~=~= ▼ fl// if (v == LOAD) { if ( current_widget->is_a(Type::Flex) || current_widget->is_a(Type::Grid) @@ -1174,10 +1174,10 @@ static void cb_Value(Fl_Value_Input* o, void* v) { //fl ▲ ----------=~~-=---=~=~----------~-=-~==-~~~=~~~--~-~-~ ▲ fl// } -Fl_Group *wp_gui_margins=(Fl_Group *)0; +Fl_Group* wp_gui_margins = (Fl_Group*)nullptr; static void cb_wp_gui_margins(Fl_Group* o, void* v) { -//fl ▼ ---------------------- callback ---~~==--~-~=~~--==~~- ▼ fl// +//fl ▼ ---------------------- callback ~~=-=~--~-=~~-~=~~-==~ ▼ fl// if (v == LOAD) { if (current_widget->is_a(Type::Flex)) { o->show(); @@ -1307,10 +1307,10 @@ static void cb_Gap(Fl_Value_Input* o, void* v) { //fl ▲ ----------~=-=~=~~~=------------~~=-~=~-=~---==~=~~=-= ▲ fl// } -Fl_Group *wp_gui_sizerange=(Fl_Group *)0; +Fl_Group* wp_gui_sizerange = (Fl_Group*)nullptr; static void cb_wp_gui_sizerange(Fl_Group* o, void* v) { -//fl ▼ ---------------------- callback ~~-==-=~--=-=~-~-~-=-~ ▼ fl// +//fl ▼ ---------------------- callback ~~-~=~~--~~=~~~~-=-=~~ ▼ fl// if (v == LOAD) { if (current_widget->is_a(Type::Window)) { o->show(); @@ -1442,10 +1442,10 @@ static void cb_set1(Fl_Button* o, void* v) { //fl ▲ ----------~=--=~--~~=~---------------=-~~=~-~=-~=~~=~- ▲ fl// } -Fl_Shortcut_Button *wp_gui_shortcut=(Fl_Shortcut_Button *)0; +Fl_Shortcut_Button* wp_gui_shortcut = (Fl_Shortcut_Button*)nullptr; static void cb_wp_gui_shortcut(Fl_Shortcut_Button* o, void* v) { -//fl ▼ ---------------------- callback -~=---=~-~--=-~~~=-~~= ▼ fl// +//fl ▼ ---------------------- callback --~~=--=---==-=~--~~~~ ▼ fl// if (v == LOAD) { if (current_widget->is_button()) o->value( ((Fl_Button*)(current_widget->o))->shortcut() ); @@ -1490,10 +1490,10 @@ static void cb_wp_gui_shortcut(Fl_Shortcut_Button* o, void* v) { //fl ▲ ----------~=~~~~~=~~~~----------~-----~=~=--~~-=-=-~~- ▲ fl// } -Fl_Group *wp_gui_xclass=(Fl_Group *)0; +Fl_Group* wp_gui_xclass = (Fl_Group*)nullptr; static void cb_3(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback ~-~=~-~~=~~~-~~-~~~~-= ▼ fl// +//fl ▼ ---------------------- callback -~=~=-~~=~-~-~~=----~= ▼ fl// if (v == LOAD) { if (current_widget->is_a(Type::Window)) { o->show(); @@ -1561,10 +1561,10 @@ static void cb_Nonmodal(Fl_Light_Button* o, void* v) { //fl ▲ ----------~=~~~-=-~=-=----------~-~-~=~--~~-=-=-~=~~=- ▲ fl// } -Fl_Group *wp_gui_attributes=(Fl_Group *)0; +Fl_Group* wp_gui_attributes = (Fl_Group*)nullptr; static void cb_Visible(Fl_Light_Button* o, void* v) { -//fl ▼ ---------------------- callback ~-~~=-~-~==--~=-~~=-=- ▼ fl// +//fl ▼ ---------------------- callback ~-~-=-~~=-~~~=~=-~~=-~ ▼ fl// if (v == LOAD) { o->value(current_widget->o->visible()); if (current_widget->is_a(Type::Window)) o->deactivate(); @@ -1695,10 +1695,10 @@ static void cb_Hotspot(Fl_Light_Button* o, void* v) { //fl ▲ ----------~=~--=~~=~-=----------~~----~-~~~=---=~-=~~~ ▲ fl// } -Fl_Input *wp_gui_tooltip=(Fl_Input *)0; +Fl_Input* wp_gui_tooltip = (Fl_Input*)nullptr; static void cb_wp_gui_tooltip(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback ~~=-~~--=--=--=-=~=-=- ▼ fl// +//fl ▼ ---------------------- callback ~--=-=~---=~--~=~=-~=- ▼ fl// if (v == LOAD) { if (current_widget->is_widget()) { o->activate(); @@ -1717,12 +1717,12 @@ static void cb_wp_gui_tooltip(Fl_Input* o, void* v) { //fl ▲ ----------~==--==-~==~-----------~--~--~~=--=-~----==- ▲ fl// } -Fl_Group *wp_style_tab=(Fl_Group *)0; +Fl_Group* wp_style_tab = (Fl_Group*)nullptr; -Fl_Group *wp_style_label=(Fl_Group *)0; +Fl_Group* wp_style_label = (Fl_Group*)nullptr; static void cb_4(Fl_Choice* o, void* v) { -//fl ▼ ---------------------- callback ~-~-~=-----~-=~-~=-~~- ▼ fl// +//fl ▼ ---------------------- callback ~--=~-=~-=-~~=~-~~-~-= ▼ fl// if (v == LOAD) { int n = current_widget->o->labelfont(); if (n > 15) n = 0; @@ -1762,10 +1762,10 @@ static void cb_5(Fl_Value_Input* o, void* v) { //fl ▲ ----------=~~=~=~--~=------------~-=~=-~-~=-~==-~-~=~~ ▲ fl// } -Fl_Button *w_labelcolor=(Fl_Button *)0; +Fl_Button* w_labelcolor = (Fl_Button*)nullptr; static void cb_w_labelcolor(Fl_Button* o, void* v) { -//fl ▼ ---------------------- callback ~-~=~~----=~-~-~=~=~-~ ▼ fl// +//fl ▼ ---------------------- callback ~---~~=~=---~=~~----=~ ▼ fl// Fl_Color c = current_widget->o->labelcolor(); if (v != LOAD) { Fl_Color d = fl_show_colormap(c); @@ -1794,10 +1794,10 @@ static void cb_6(Fl_Menu_Button* o, void* v) { //fl ▲ ----------~=-~~~~----=----------~~=-=-=-~~--~=-~~~-=~= ▲ fl// } -Fl_Group *wp_style_box=(Fl_Group *)0; +Fl_Group* wp_style_box = (Fl_Group*)nullptr; static void cb_7(Fl_Choice* o, void* v) { -//fl ▼ ---------------------- callback ~-~--~-~~=--~~=-=---=- ▼ fl// +//fl ▼ ---------------------- callback ~--~~~=-=~=--~~-~==~~~ ▼ fl// if (v == LOAD) { if (current_widget->is_a(Type::Menu_Item)) {o->deactivate(); return;} else o->activate(); int n = current_widget->o->box(); @@ -1820,10 +1820,10 @@ static void cb_7(Fl_Choice* o, void* v) { //fl ▲ ----------~==-~--~~--=----------~~~~--~--=--=~=~~--=-~ ▲ fl// } -Fl_Button *w_color=(Fl_Button *)0; +Fl_Button* w_color = (Fl_Button*)nullptr; static void cb_w_color(Fl_Button* o, void* v) { -//fl ▼ ---------------------- callback --=---~=~--~~-=~--~~~- ▼ fl// +//fl ▼ ---------------------- callback --~---=~=~~-~=~==~=-~~ ▼ fl// Fl_Color c = current_widget->o->color(); if (v == LOAD) { if (current_widget->is_a(Type::Menu_Item)) { @@ -1860,10 +1860,10 @@ static void cb_8(Fl_Menu_Button* o, void* v) { //fl ▲ ----------~==~=---~~--------------~~-==-~--~~-=-~=~~~~ ▲ fl// } -Fl_Group *wp_style_downbox=(Fl_Group *)0; +Fl_Group* wp_style_downbox = (Fl_Group*)nullptr; static void cb_9(Fl_Choice* o, void* v) { -//fl ▼ ---------------------- callback -~-=----~-~-~==-=--=~= ▼ fl// +//fl ▼ ---------------------- callback ---~=~----=~~~=~=~~-=- ▼ fl// if (v == LOAD) { int n; if (current_widget->is_a(Type::Button)) @@ -1901,10 +1901,10 @@ static void cb_9(Fl_Choice* o, void* v) { //fl ▲ ----------=~=--~-=---=------------=~---~~~=-=-~=~=~~-= ▲ fl// } -Fl_Button *w_selectcolor=(Fl_Button *)0; +Fl_Button* w_selectcolor = (Fl_Button*)nullptr; static void cb_w_selectcolor(Fl_Button* o, void* v) { -//fl ▼ ---------------------- callback --~~~-=~~-=--~~~~-=~~~ ▼ fl// +//fl ▼ ---------------------- callback -~=--~-~=-~==-=~-~=~=- ▼ fl// Fl_Color c = current_widget->o->selection_color(); if (v == LOAD) { if (current_widget->is_a(Type::Menu_Item)) { @@ -1947,10 +1947,10 @@ static void cb_a(Fl_Menu_Button* o, void* v) { //fl ▲ ----------=~~~--~=~=~~-----------~=-~-=-~~~-=~-=-=-~~= ▲ fl// } -Fl_Group *wp_style_text=(Fl_Group *)0; +Fl_Group* wp_style_text = (Fl_Group*)nullptr; static void cb_b(Fl_Choice* o, void* v) { -//fl ▼ ---------------------- callback -----==-=-~=----~~~-~~ ▼ fl// +//fl ▼ ---------------------- callback -~~~=~~-=---=~=~-=-=~= ▼ fl// Fl_Font n; int s; Fl_Color c; if (v == LOAD) { if (!current_widget->textstuff(0,n,s,c)) {o->deactivate(); return;} @@ -1993,10 +1993,10 @@ static void cb_c(Fl_Value_Input* o, void* v) { //fl ▲ ----------~==--=---~~------------~=-=----=~==-=~=~=-~~ ▲ fl// } -Fl_Button *w_textcolor=(Fl_Button *)0; +Fl_Button* w_textcolor = (Fl_Button*)nullptr; static void cb_w_textcolor(Fl_Button* o, void* v) { -//fl ▼ ---------------------- callback ~~~==~-=~-=~-~--~~~=-- ▼ fl// +//fl ▼ ---------------------- callback ~~--~~=~-=--~~--~=~~-= ▼ fl// Fl_Font n; int s; Fl_Color c; if (v == LOAD) { if (!current_widget->textstuff(0,n,s,c)) { @@ -2161,12 +2161,12 @@ static void cb_Compact(Fl_Light_Button* o, void* v) { //fl ▲ ----------=~-==~~-=-=-----------~~=~-~~~=-~--=~=-~~-~~ ▲ fl// } -Fl_Group *wp_cpp_tab=(Fl_Group *)0; +Fl_Group* wp_cpp_tab = (Fl_Group*)nullptr; -Fl_Group *wp_cpp_class=(Fl_Group *)0; +Fl_Group* wp_cpp_class = (Fl_Group*)nullptr; static void cb_e(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback ~-~=~--~--~-~-~=-~~-~~ ▼ fl// +//fl ▼ ---------------------- callback -~-==~--=--=-~=--=~=-= ▼ fl// if (v == LOAD) { if (current_widget->is_a(Type::Menu_Item)) { o->deactivate(); @@ -2234,10 +2234,10 @@ static void cb_f(Fl_Choice* o, void* v) { //fl ▲ ----------=~=~=--==~=--------------~-==--~~-=--~=-~-~= ▲ fl// } -Fl_Group *wp_cpp_name=(Fl_Group *)0; +Fl_Group* wp_cpp_name = (Fl_Group*)nullptr; static void cb_10(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback ~~~~-~-=-~~==-=-~=-~~= ▼ fl// +//fl ▼ ---------------------- callback ~~~-~=~=~=~-=-----~=~- ▼ fl// if (v == LOAD) { static char buf[1024]; if (numselected != 1) { @@ -2287,20 +2287,20 @@ static void cb_11(Fl_Choice* o, void* v) { } Fl_Menu_Item menu_2[] = { - {"private", 0, 0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"public", 0, 0, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"protected", 0, 0, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {0,0,0,0,0,0,0,0,0} + {"private", 0, nullptr, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"public", 0, nullptr, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"protected", 0, nullptr, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; Fl_Menu_Item menu_3[] = { - {"local", 0, 0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"global", 0, 0, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {0,0,0,0,0,0,0,0,0} + {"local", 0, nullptr, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"global", 0, nullptr, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_v_input(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback ~~-==~=~-~~==-=--~~--= ▼ fl// +//fl ▼ ---------------------- callback ~--~=-~=~=~~~--~~~-==~ ▼ fl// int n = fl_int(o->user_data()); if (v == LOAD) { o->value(current_widget->extra_code(n).c_str()); @@ -2330,10 +2330,10 @@ static void cb_v_input2(Fl_Input* o, void* v) { //fl ▲ ----------=~-~-=--~~-=----------~-~-~=~~-------=-=-=-= ▲ fl// } -Fl_Input *v_input[4]={(Fl_Input *)0}; +Fl_Input* v_input[4] = {(Fl_Input*)nullptr}; static void cb_v_input3(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback ~----~-~=~~--~--~~~~=~ ▼ fl// +//fl ▼ ---------------------- callback ---~=~~--~=-=~~=--~~-- ▼ fl// cb_v_input(o, v); //fl ▲ ----------~==-=-~--~~=----------~-~-~=~~-------=-=-=-= ▲ fl// } @@ -2345,10 +2345,10 @@ static void cb_12(Fl_Tile*, void* v) { //fl ▲ ----------~=~~~=~=~=~~-----------~~--~-=--~=-=~~-~=~=~ ▲ fl// } -Fl_Text_Editor *wComment=(Fl_Text_Editor *)0; +Fl_Text_Editor* wComment = (Fl_Text_Editor*)nullptr; static void cb_wComment(Fl_Text_Editor* o, void* v) { -//fl ▼ ---------------------- callback ----~~=~~--==--=~----~ ▼ fl// +//fl ▼ ---------------------- callback -~~-=~-~--=~---=--~--- ▼ fl// if (v == LOAD) { const char *cmttext = current_widget->comment(); o->buffer()->text( cmttext ? cmttext : "" ); @@ -2365,10 +2365,10 @@ static void cb_wComment(Fl_Text_Editor* o, void* v) { //fl ▲ ----------=~---~~-=--~----------~~-~--=~~~-~~==~~=~~~- ▲ fl// } -fld::widget::Code_Editor *wCallback=(fld::widget::Code_Editor *)0; +fld::widget::Code_Editor* wCallback = (fld::widget::Code_Editor*)nullptr; static void cb_wCallback(fld::widget::Code_Editor* o, void* v) { -//fl ▼ ---------------------- callback ~--~-~-~~-=~~-~=~=-~~= ▼ fl// +//fl ▼ ---------------------- callback ~-~=-==-~==~-=~~-=--=~ ▼ fl// if (v == LOAD) { const char *cbtext = current_widget->callback(); o->buffer()->text( cbtext ? cbtext : "" ); @@ -2391,10 +2391,10 @@ static void cb_wCallback(fld::widget::Code_Editor* o, void* v) { //fl ▲ ----------=~-~-==~~-=------------~=-~~-~~=-=~--~~--=~~ ▲ fl// } -Fl_Group *wp_cpp_callback=(Fl_Group *)0; +Fl_Group* wp_cpp_callback = (Fl_Group*)nullptr; static void cb_13(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback -~~=~-~----==~-=~~=~-= ▼ fl// +//fl ▼ ---------------------- callback ~~-~---~-~~~=-=~-~~==~ ▼ fl// if (v == LOAD) { o->value(current_widget->user_data().c_str()); } else { @@ -2484,42 +2484,42 @@ static void cb_14(Fl_Input_Choice* o, void* v) { } Fl_Menu_Item menu_4[] = { - {"void*", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 4, 11, 0}, - {"long", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 4, 11, 0}, - {0,0,0,0,0,0,0,0,0} + {"void*", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 4, 11, 0 }, + {"long", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 4, 11, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; -Fl_Box *w_when_box=(Fl_Box *)0; +Fl_Box* w_when_box = (Fl_Box*)nullptr; -Grid_Tab *widget_tab_grid=(Grid_Tab *)0; +Grid_Tab* widget_tab_grid = (Grid_Tab*)nullptr; static void cb_widget_tab_grid(Grid_Tab* o, void*) { -//fl ▼ ---------------------- callback -~--=~~~~~=-~~=-=~-~~- ▼ fl// +//fl ▼ ---------------------- callback ~~=-~-=~=~~=~-~==~=~~~ ▼ fl// o->callback((Fl_Callback*)propagate_load); //fl ▲ ----------~=---==~~--~----------~~~==-=--~-~-=~~=-~=-= ▲ fl// } -Grid_Child_Tab *widget_tab_grid_child=(Grid_Child_Tab *)0; +Grid_Child_Tab* widget_tab_grid_child = (Grid_Child_Tab*)nullptr; static void cb_widget_tab_grid_child(Grid_Child_Tab* o, void*) { -//fl ▼ ---------------------- callback -~-==-=~~~~~~==~~--~-~ ▼ fl// +//fl ▼ ---------------------- callback ~-=~=~=-=--=-=---~=--= ▼ fl// o->callback((Fl_Callback*)propagate_load); //fl ▲ ----------=~-~=-~~-==-----------~~~==-=--~-~-=~~=-~=-= ▲ fl// } -Fl_Tabs *data_tabs=(Fl_Tabs *)0; +Fl_Tabs* data_tabs = (Fl_Tabs*)nullptr; static void cb_data_tabs(Fl_Tabs* o, void* v) { -//fl ▼ ---------------------- callback -~-==~-~-~-~-=-~~-~==- ▼ fl// +//fl ▼ ---------------------- callback -----~=~~-~=~==-~-~~~- ▼ fl// if (current_node && current_node->is_a(Type::Data)) propagate_load((Fl_Group *)o,v); //fl ▲ ----------~=~~=-~~-==-----------~-=~=~~=--~--==~=-=~=- ▲ fl// } -Fl_Group *data_tabs_data=(Fl_Group *)0; +Fl_Group* data_tabs_data = (Fl_Group*)nullptr; static void cb_15(Fl_Choice* o, void* v) { -//fl ▼ ---------------------- callback --~~-==-=~-==-~-~-~~-= ▼ fl// +//fl ▼ ---------------------- callback ~-=~~-~=---~=-~~~=~=~~ ▼ fl// if (!current_node || !current_node->is_a(Type::Data)) return; Data_Node* nd = (Data_Node*)current_node; @@ -2543,15 +2543,15 @@ static void cb_15(Fl_Choice* o, void* v) { } Fl_Menu_Item menu_5[] = { - {"in source file only", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"in header file only", 0, 0, 0, 16, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"\"static\" in source file", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"in source and \"extern\" in header", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {0,0,0,0,0,0,0,0,0} + {"in source file only", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"in header file only", 0, nullptr, nullptr, 16, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"\"static\" in source file", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"in source and \"extern\" in header", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_16(Fl_Choice* o, void* v) { -//fl ▼ ---------------------- callback ~-=~-=--~~-=--=~~~=-=- ▼ fl// +//fl ▼ ---------------------- callback ~~~~-~---=-=~==-=-=--~ ▼ fl// if (!current_node || !current_node->is_a(Type::Data)) return; Data_Node* nd = (Data_Node*)current_node; @@ -2575,14 +2575,14 @@ static void cb_16(Fl_Choice* o, void* v) { } Fl_Menu_Item menu_6[] = { - {"private", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"public", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"protected", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {0,0,0,0,0,0,0,0,0} + {"private", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"public", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"protected", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_17(Fl_Choice* o, void* v) { -//fl ▼ ---------------------- callback -~=---~-=~=---=~~~=--= ▼ fl// +//fl ▼ ---------------------- callback ~-=-=-~=~~---~~~--~-~~ ▼ fl// if (!current_node || !current_node->is_a(Type::Data)) return; Data_Node* nd = (Data_Node*)current_node; @@ -2598,17 +2598,17 @@ static void cb_17(Fl_Choice* o, void* v) { } Fl_Menu_Item menu_7[] = { - {"binary: unsigned char[]", 0, 0, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"text: const char*", 0, 0, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"compressed: unsigned char[]", 0, 0, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"binary: std::vector", 0, 0, (void*)(3), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"text: std::string", 0, 0, (void*)(4), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"compressed: std::vector", 0, 0, (void*)(5), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {0,0,0,0,0,0,0,0,0} + {"binary: unsigned char[]", 0, nullptr, (void*)(0), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"text: const char*", 0, nullptr, (void*)(1), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"compressed: unsigned char[]", 0, nullptr, (void*)(2), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"binary: std::vector", 0, nullptr, (void*)(3), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"text: std::string", 0, nullptr, (void*)(4), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"compressed: std::vector", 0, nullptr, (void*)(5), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_Name(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback ~~-~~~-~=~~~=~-~~=-~-= ▼ fl// +//fl ▼ ---------------------- callback ~~-=~=~~~=~-=-~=~-~--- ▼ fl// if (!current_node || !current_node->is_a(Type::Data)) return; Data_Node* nd = (Data_Node*)current_node; @@ -2628,10 +2628,10 @@ static void cb_Name(Fl_Input* o, void* v) { //fl ▲ ----------=~=~-~--~=~~------------~~-=-~=~-=-~~-~=~--= ▲ fl// } -Fl_Input *wp_data_filename=(Fl_Input *)0; +Fl_Input* wp_data_filename = (Fl_Input*)nullptr; static void cb_wp_data_filename(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback ~-~=~~~~~~-=~~=~-==--- ▼ fl// +//fl ▼ ---------------------- callback ~-=-~-~==~=~-=~=~-~--= ▼ fl// if (!current_node || !current_node->is_a(Type::Data)) return; Data_Node* nd = (Data_Node*)current_node; update_current(o, v, @@ -2682,21 +2682,21 @@ static void cb_Comment(Fl_Text_Editor* o, void* v) { //fl ▲ ----------=~--=-~-~-~=----------~~-=~=-=-~~=---~-~---= ▲ fl// } -Fl_Tabs *comment_tabs=(Fl_Tabs *)0; +Fl_Tabs* comment_tabs = (Fl_Tabs*)nullptr; static void cb_comment_tabs(Fl_Tabs* o, void* v) { -//fl ▼ ---------------------- callback ---~~~~==~~=~~~~--~~~~ ▼ fl// +//fl ▼ ---------------------- callback ---~~~~~~~-~-~~~~=~-~- ▼ fl// if (current_node && current_node->is_a(Type::Comment)) propagate_load((Fl_Group *)o,v); //fl ▲ ----------=~--~=---~~=----------~--~=-~=---=~-~=~~=-~~ ▲ fl// } -Fl_Group *comment_tabs_comment=(Fl_Group *)0; +Fl_Group* comment_tabs_comment = (Fl_Group*)nullptr; -Fl_Text_Editor *comment_tabs_name=(Fl_Text_Editor *)0; +Fl_Text_Editor* comment_tabs_name = (Fl_Text_Editor*)nullptr; static void cb_comment_tabs_name(Fl_Text_Editor* o, void* v) { -//fl ▼ ---------------------- callback --~~-~-~~=--~---~~~~=- ▼ fl// +//fl ▼ ---------------------- callback ~-=-~=-=-==~=~-=~-=~=- ▼ fl// if (!current_node || !current_node->is_a(Type::Comment)) return; Comment_Node* nd = (Comment_Node*)current_node; @@ -2719,10 +2719,10 @@ static void cb_comment_tabs_name(Fl_Text_Editor* o, void* v) { //fl ▲ ----------=~~=~~~==~=~----------~~-~-==~-=--~==~=-~--~ ▲ fl// } -Fl_Menu_Button *comment_predefined_2=(Fl_Menu_Button *)0; +Fl_Menu_Button* comment_predefined_2 = (Fl_Menu_Button*)nullptr; static void cb_comment_predefined_2(Fl_Menu_Button* o, void* v) { -//fl ▼ ---------------------- callback ~-~-=~=~=-=--=~==-~--- ▼ fl// +//fl ▼ ---------------------- callback ~~~~-=-=~~--=--==---=- ▼ fl// if (!current_node || !current_node->is_a(Type::Comment)) return; static char itempath[256]; @@ -2801,10 +2801,10 @@ static void cb_comment_predefined_2(Fl_Menu_Button* o, void* v) { //fl ▲ ----------~=~~~-=~~~~-----------~-=~~--~=-~-~~=~--~==~ ▲ fl// } -Fl_Button *comment_load_2=(Fl_Button *)0; +Fl_Button* comment_load_2 = (Fl_Button*)nullptr; static void cb_comment_load_2(Fl_Button*, void* v) { -//fl ▼ ---------------------- callback -~~=-~~=--~~--~~=~---- ▼ fl// +//fl ▼ ---------------------- callback ~~~~~=~-=~~-=-=-~=-=~= ▼ fl// // load a comment from disk if (v != LOAD) { fl_file_chooser_ok_label("Load"); @@ -2852,19 +2852,19 @@ static void cb_output1(Fl_Check_Button* o, void* v) { //fl ▲ ----------~=-==-~=--~=----------~~~~=~~~=~----~~--~=~= ▲ fl// } -Fl_Tabs *class_tabs=(Fl_Tabs *)0; +Fl_Tabs* class_tabs = (Fl_Tabs*)nullptr; static void cb_class_tabs(Fl_Tabs* o, void* v) { -//fl ▼ ---------------------- callback -~-----=-~-=~-~=-~---- ▼ fl// +//fl ▼ ---------------------- callback ~-~-=--==~~--=~~--~-~= ▼ fl// if (current_node && current_node->is_a(Type::Class)) propagate_load((Fl_Group *)o,v); //fl ▲ ----------=~----~=-==-----------~-~~~~=~~~-==~-=~=~~-= ▲ fl// } -Fl_Group *class_tabs_main=(Fl_Group *)0; +Fl_Group* class_tabs_main = (Fl_Group*)nullptr; static void cb_18(Fl_Choice* o, void* v) { -//fl ▼ ---------------------- callback ---=~~-~=~--=----=~--= ▼ fl// +//fl ▼ ---------------------- callback ~--~~-~--=~=-==-~~~=-~ ▼ fl// if (!current_node || !current_node->is_a(Type::Class)) return; Class_Node* nd = (Class_Node*)current_node; @@ -2888,14 +2888,14 @@ static void cb_18(Fl_Choice* o, void* v) { } Fl_Menu_Item menu_8[] = { - {"private", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"public", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"protected", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {0,0,0,0,0,0,0,0,0} + {"private", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"public", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"protected", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_Attribute(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback -~~==-~---~~~~~=~=--~~ ▼ fl// +//fl ▼ ---------------------- callback ~~~==----~=--~~=~~~-=- ▼ fl// if (!current_node || !current_node->is_a(Type::Class)) return; Class_Node* nd = (Class_Node*)current_node; @@ -2997,19 +2997,19 @@ static void cb_Comment1(Fl_Text_Editor* o, void* v) { //fl ▲ ----------=~-~-=-=-=~~-----------~=--~--~=-~~--~----~- ▲ fl// } -Fl_Tabs *declblock_tabs=(Fl_Tabs *)0; +Fl_Tabs* declblock_tabs = (Fl_Tabs*)nullptr; static void cb_declblock_tabs(Fl_Tabs* o, void* v) { -//fl ▼ ---------------------- callback ~~--=~~=~~~~-==-~=~~=~ ▼ fl// +//fl ▼ ---------------------- callback ~~~=~=---=---~-=-=~-=~ ▼ fl// if (current_node && current_node->is_a(Type::DeclBlock)) propagate_load((Fl_Group *)o,v); //fl ▲ ----------=~=~~=-=~--=-------------~-~=~~=-=-~=~----=~ ▲ fl// } -Fl_Group *declblock_tabs_main=(Fl_Group *)0; +Fl_Group* declblock_tabs_main = (Fl_Group*)nullptr; static void cb_Start(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback ~-~=~-~=----~=~==~~-~~ ▼ fl// +//fl ▼ ---------------------- callback --=~---=---=-~~~-~-~=- ▼ fl// if (!current_node || !current_node->is_a(Type::DeclBlock)) return; DeclBlock_Node* nd = (DeclBlock_Node*)current_node; @@ -3147,19 +3147,19 @@ static void cb_Comment2(Fl_Text_Editor* o, void* v) { //fl ▲ ----------=~-~=~-~~=~~-----------~-=-=-=-~---~=-~-=~-~ ▲ fl// } -Fl_Tabs *decl_tabs=(Fl_Tabs *)0; +Fl_Tabs* decl_tabs = (Fl_Tabs*)nullptr; static void cb_decl_tabs(Fl_Tabs* o, void* v) { -//fl ▼ ---------------------- callback --~--~=~~~-~--=~--=~=~ ▼ fl// +//fl ▼ ---------------------- callback ~~~=--~-~-=-=~=~-=~==- ▼ fl// if (current_node && current_node->is_a(Type::Decl)) propagate_load((Fl_Group *)o,v); //fl ▲ ----------=~~~-==-=~=~----------~~-~=~~~~==~--~--=--=~ ▲ fl// } -Fl_Group *decl_tabs_main=(Fl_Group *)0; +Fl_Group* decl_tabs_main = (Fl_Group*)nullptr; static void cb_19(Fl_Choice* o, void* v) { -//fl ▼ ---------------------- callback -~~==~--~~~-=-~~-==--= ▼ fl// +//fl ▼ ---------------------- callback -~=--~~=~--~-~=~~-~~=- ▼ fl// if (!current_node || !current_node->is_a(Type::Decl)) return; Decl_Node* nd = (Decl_Node*)current_node; @@ -3183,15 +3183,15 @@ static void cb_19(Fl_Choice* o, void* v) { } Fl_Menu_Item menu_9[] = { - {"in source file only", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"in header file only", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"\"static\" in source file", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"in source and \"extern\" in header", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {0,0,0,0,0,0,0,0,0} + {"in source file only", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"in header file only", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"\"static\" in source file", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"in source and \"extern\" in header", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_1a(Fl_Choice* o, void* v) { -//fl ▼ ---------------------- callback -~-~-=~~~~=~~=--~-~~~= ▼ fl// +//fl ▼ ---------------------- callback ~~~==~~~----~==~------ ▼ fl// if (!current_node || !current_node->is_a(Type::Decl)) return; Decl_Node* nd = (Decl_Node*)current_node; @@ -3215,14 +3215,14 @@ static void cb_1a(Fl_Choice* o, void* v) { } Fl_Menu_Item menu_a[] = { - {"private", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"public", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"protected", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {0,0,0,0,0,0,0,0,0} + {"private", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"public", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"protected", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_1b(Fl_Tile* o, void* v) { -//fl ▼ ---------------------- callback ~~~=~=--=~=-=-~~--=--- ▼ fl// +//fl ▼ ---------------------- callback -~=~--~-~-=~-~~=--~=-~ ▼ fl// propagate_load(o, v); //fl ▲ ----------=~-=~--~~=~=-----------~~----=--~=~~-~-----= ▲ fl// } @@ -3274,19 +3274,19 @@ static void cb_Comment3(Fl_Text_Editor* o, void* v) { //fl ▲ ----------~=-----~-==~-------------==~-=~--~=~-~--~-~- ▲ fl// } -Fl_Tabs *codeblock_tabs=(Fl_Tabs *)0; +Fl_Tabs* codeblock_tabs = (Fl_Tabs*)nullptr; static void cb_codeblock_tabs(Fl_Tabs* o, void* v) { -//fl ▼ ---------------------- callback ~-~=~~~--~~=-~~-~---~~ ▼ fl// +//fl ▼ ---------------------- callback -~--=~~=--~-~-~--==--= ▼ fl// if (current_node && current_node->is_a(Type::CodeBlock)) propagate_load((Fl_Group *)o,v); //fl ▲ ----------=~--~~~~~-~-----------~-=-=--~-=-=---=---~=- ▲ fl// } -Fl_Group *codeblock_tabs_main=(Fl_Group *)0; +Fl_Group* codeblock_tabs_main = (Fl_Group*)nullptr; static void cb_Start1(Fl_Input* o, void* v) { -//fl ▼ ---------------------- callback -~-~=-=~~=~=~-~==-~-=- ▼ fl// +//fl ▼ ---------------------- callback ~-=~~~--=~-=-=-=~~~-=- ▼ fl// if (!current_node || !current_node->is_a(Type::CodeBlock)) return; CodeBlock_Node* nd = (CodeBlock_Node*)current_node; @@ -3340,19 +3340,19 @@ static void cb_Comment4(Fl_Text_Editor* o, void* v) { //fl ▲ ----------~=-~-~=~~=-------------~--=~=----~-=-=-~~~=~ ▲ fl// } -Fl_Tabs *code_tabs=(Fl_Tabs *)0; +Fl_Tabs* code_tabs = (Fl_Tabs*)nullptr; static void cb_code_tabs(Fl_Tabs* o, void* v) { -//fl ▼ ---------------------- callback ---~-=-~-==-~=-=~~=-~- ▼ fl// +//fl ▼ ---------------------- callback ------=~=~~-~--=~=-~=~ ▼ fl// if (current_node && current_node->is_a(Type::Code)) propagate_load((Fl_Group *)o,v); //fl ▲ ----------=~=~-~=~-~=~----------~~=~~~-=--~-=~--=~---= ▲ fl// } -Fl_Group *code_tabs_main=(Fl_Group *)0; +Fl_Group* code_tabs_main = (Fl_Group*)nullptr; static void cb_1c(fld::widget::Code_Editor* o, void* v) { -//fl ▼ ---------------------- callback ~-=--~=~~==~=~=~-~--=~ ▼ fl// +//fl ▼ ---------------------- callback ~~-==-=~~--~=~=~-~~-~- ▼ fl// if (!current_node || !current_node->is_a(Type::Code)) return; Code_Node* nd = (Code_Node*)current_node; if (v == LOAD) { @@ -3379,19 +3379,19 @@ static void cb_1c(fld::widget::Code_Editor* o, void* v) { //fl ▲ ----------=~=~=~~=--=~------------=-----~=~~-~-=-~~=~= ▲ fl// } -Fl_Tabs *func_tabs=(Fl_Tabs *)0; +Fl_Tabs* func_tabs = (Fl_Tabs*)nullptr; static void cb_func_tabs(Fl_Tabs* o, void* v) { -//fl ▼ ---------------------- callback ~~=~~==~~-~~-~=~=-=~-- ▼ fl// +//fl ▼ ---------------------- callback -~=~=~=-=~-~=~~=~=-~~= ▼ fl// if (current_node && current_node->is_a(Type::Function)) propagate_load((Fl_Group *)o,v); //fl ▲ ----------~=~--=~=--~~------------~-~=-~=~=~=~~~~~=--= ▲ fl// } -Fl_Group *func_tabs_main=(Fl_Group *)0; +Fl_Group* func_tabs_main = (Fl_Group*)nullptr; static void cb_1d(Fl_Choice* o, void* v) { -//fl ▼ ---------------------- callback ----~-~=--~-=~~~-~~==- ▼ fl// +//fl ▼ ---------------------- callback ~-=---~~~~=~=~-~~~-=-- ▼ fl// if (!current_node || !current_node->is_a(Type::Function)) return; Function_Node* nd = (Function_Node*)current_node; @@ -3415,14 +3415,14 @@ static void cb_1d(Fl_Choice* o, void* v) { } Fl_Menu_Item menu_b[] = { - {"static", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"global", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"local", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {0,0,0,0,0,0,0,0,0} + {"static", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"global", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"local", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_1e(Fl_Choice* o, void* v) { -//fl ▼ ---------------------- callback ~-=~-=~---=~--~==-=~=- ▼ fl// +//fl ▼ ---------------------- callback -~-~~==~--=--~~~~-=-=- ▼ fl// if (!current_node || !current_node->is_a(Type::Function)) return; Function_Node* nd = (Function_Node*)current_node; @@ -3446,14 +3446,14 @@ static void cb_1e(Fl_Choice* o, void* v) { } Fl_Menu_Item menu_c[] = { - {"private", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"public", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {"protected", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, - {0,0,0,0,0,0,0,0,0} + {"private", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"public", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + {"protected", 0, nullptr, nullptr, 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0 }, + { nullptr, 0, nullptr, nullptr, 0, 0, 0, 0, 0 } }; static void cb_declare(Fl_Check_Button* o, void* v) { -//fl ▼ ---------------------- callback ~-~-=-~-=~-=~=~-~=-=-~ ▼ fl// +//fl ▼ ---------------------- callback ---=~~--~--~~=-==~~=~= ▼ fl// if (!current_node || !current_node->is_a(Type::Function)) return; Function_Node* nd = (Function_Node*)current_node; @@ -3532,11 +3532,11 @@ static void cb_Comment5(Fl_Text_Editor* o, void* v) { //fl ▲ ----------=~~~-==-~~=~----------~-~=~=-=-~-~=-~-~=~-=- ▲ fl// } -Fl_Tabs *widget_tabs_repo=(Fl_Tabs *)0; +Fl_Tabs* widget_tabs_repo = (Fl_Tabs*)nullptr; -Fl_Button *wLiveMode=(Fl_Button *)0; +Fl_Button* wLiveMode = (Fl_Button*)nullptr; -Fl_Button *overlay_button=(Fl_Button *)0; +Fl_Button* overlay_button = (Fl_Button*)nullptr; /** Create a panel that can be used with all known widgets diff --git a/fluid/panels/widget_panel.h b/fluid/panels/widget_panel.h index 98d1066b7..6eea9fbef 100644 --- a/fluid/panels/widget_panel.h +++ b/fluid/panels/widget_panel.h @@ -24,116 +24,116 @@ #include "widgets/Formula_Input.h" class Fl_Flex; #include -extern Fl_Double_Window *image_panel_window; +extern Fl_Double_Window* image_panel_window; #include extern void propagate_load(Fl_Group*, void*); -extern Fl_Group *image_panel_imagegroup; +extern Fl_Group* image_panel_imagegroup; #include #include -extern Fl_Box *image_panel_data; -extern fld::widget::Formula_Input *image_panel_imagew; -extern fld::widget::Formula_Input *image_panel_imageh; +extern Fl_Box* image_panel_data; +extern fld::widget::Formula_Input* image_panel_imagew; +extern fld::widget::Formula_Input* image_panel_imageh; #include #include -extern Fl_Group *image_panel_deimagegroup; -extern Fl_Box *image_panel_dedata; -extern fld::widget::Formula_Input *image_panel_deimagew; -extern fld::widget::Formula_Input *image_panel_deimageh; -extern Fl_Button *image_panel_close; +extern Fl_Group* image_panel_deimagegroup; +extern Fl_Box* image_panel_dedata; +extern fld::widget::Formula_Input* image_panel_deimagew; +extern fld::widget::Formula_Input* image_panel_deimageh; +extern Fl_Button* image_panel_close; Fl_Double_Window* make_image_panel(); void run_image_panel(); void flex_margin_cb(Fl_Value_Input* i, void* v, void (*load_margin)(Fl_Flex*,Fl_Value_Input*), int (*update_margin)(Fl_Flex*,int)); #include -extern Fl_Wizard *tabs_wizard; +extern Fl_Wizard* tabs_wizard; #include -extern Fl_Tabs *widget_tabs; -extern Fl_Group *wp_gui_tab; +extern Fl_Tabs* widget_tabs; +extern Fl_Group* wp_gui_tab; #include extern void label_cb(Fl_Input*, void*); -extern Fl_Input *wp_gui_label; +extern Fl_Input* wp_gui_label; #include extern Fl_Menu_Item labeltypemenu[]; extern void labeltype_cb(Fl_Choice*, void*); -extern Fl_Input *widget_image_input; -extern Fl_Input *widget_deimage_input; -extern Fl_Group *wp_gui_alignment; +extern Fl_Input* widget_image_input; +extern Fl_Input* widget_deimage_input; +extern Fl_Group* wp_gui_alignment; extern void align_cb(Fl_Button*, void*); extern void align_text_image_cb(Fl_Choice*, void*); extern void align_position_cb(Fl_Choice*, void*); extern void position_group_cb(Fl_Group*, void*); -extern fld::widget::Formula_Input *widget_x_input; -extern fld::widget::Formula_Input *widget_y_input; -extern fld::widget::Formula_Input *widget_w_input; -extern fld::widget::Formula_Input *widget_h_input; -extern Fl_Group *wp_gui_flexp; +extern fld::widget::Formula_Input* widget_x_input; +extern fld::widget::Formula_Input* widget_y_input; +extern fld::widget::Formula_Input* widget_w_input; +extern fld::widget::Formula_Input* widget_h_input; +extern Fl_Group* wp_gui_flexp; #include -extern Fl_Value_Input *widget_flex_size; -extern Fl_Check_Button *widget_flex_fixed; -extern Fl_Group *wp_gui_values; -extern Fl_Group *wp_gui_margins; -extern Fl_Group *wp_gui_sizerange; +extern Fl_Value_Input* widget_flex_size; +extern Fl_Check_Button* widget_flex_fixed; +extern Fl_Group* wp_gui_values; +extern Fl_Group* wp_gui_margins; +extern Fl_Group* wp_gui_sizerange; #include -extern Fl_Shortcut_Button *wp_gui_shortcut; -extern Fl_Group *wp_gui_xclass; +extern Fl_Shortcut_Button* wp_gui_shortcut; +extern Fl_Group* wp_gui_xclass; #include -extern Fl_Group *wp_gui_attributes; -extern Fl_Input *wp_gui_tooltip; -extern Fl_Group *wp_style_tab; -extern Fl_Group *wp_style_label; +extern Fl_Group* wp_gui_attributes; +extern Fl_Input* wp_gui_tooltip; +extern Fl_Group* wp_style_tab; +extern Fl_Group* wp_style_label; extern Fl_Menu_Item fontmenu[]; -extern Fl_Button *w_labelcolor; +extern Fl_Button* w_labelcolor; #include extern Fl_Menu_Item colormenu[]; -extern Fl_Group *wp_style_box; +extern Fl_Group* wp_style_box; extern Fl_Menu_Item boxmenu[]; -extern Fl_Button *w_color; -extern Fl_Group *wp_style_downbox; -extern Fl_Button *w_selectcolor; -extern Fl_Group *wp_style_text; -extern Fl_Button *w_textcolor; -extern Fl_Group *wp_cpp_tab; -extern Fl_Group *wp_cpp_class; -extern Fl_Group *wp_cpp_name; +extern Fl_Button* w_color; +extern Fl_Group* wp_style_downbox; +extern Fl_Button* w_selectcolor; +extern Fl_Group* wp_style_text; +extern Fl_Button* w_textcolor; +extern Fl_Group* wp_cpp_tab; +extern Fl_Group* wp_cpp_class; +extern Fl_Group* wp_cpp_name; extern void name_public_cb(Fl_Choice*, void*); -extern Fl_Input *v_input[4]; +extern Fl_Input* v_input[4]; #include #include -extern Fl_Text_Editor *wComment; +extern Fl_Text_Editor* wComment; #include "widgets/Code_Editor.h" -extern fld::widget::Code_Editor *wCallback; -extern Fl_Group *wp_cpp_callback; +extern fld::widget::Code_Editor* wCallback; +extern Fl_Group* wp_cpp_callback; extern Fl_Menu_Item whenmenu[]; #include -extern Fl_Box *w_when_box; -extern Grid_Tab *widget_tab_grid; -extern Grid_Child_Tab *widget_tab_grid_child; -extern Fl_Tabs *data_tabs; -extern Fl_Group *data_tabs_data; -extern Fl_Input *wp_data_filename; -extern Fl_Tabs *comment_tabs; -extern Fl_Group *comment_tabs_comment; -extern Fl_Text_Editor *comment_tabs_name; +extern Fl_Box* w_when_box; +extern Grid_Tab* widget_tab_grid; +extern Grid_Child_Tab* widget_tab_grid_child; +extern Fl_Tabs* data_tabs; +extern Fl_Group* data_tabs_data; +extern Fl_Input* wp_data_filename; +extern Fl_Tabs* comment_tabs; +extern Fl_Group* comment_tabs_comment; +extern Fl_Text_Editor* comment_tabs_name; extern void load_comments_preset(Fl_Preferences &menu); #include -extern Fl_Menu_Button *comment_predefined_2; -extern Fl_Button *comment_load_2; -extern Fl_Tabs *class_tabs; -extern Fl_Group *class_tabs_main; -extern Fl_Tabs *declblock_tabs; -extern Fl_Group *declblock_tabs_main; -extern Fl_Tabs *decl_tabs; -extern Fl_Group *decl_tabs_main; -extern Fl_Tabs *codeblock_tabs; -extern Fl_Group *codeblock_tabs_main; -extern Fl_Tabs *code_tabs; -extern Fl_Group *code_tabs_main; -extern Fl_Tabs *func_tabs; -extern Fl_Group *func_tabs_main; -extern Fl_Tabs *widget_tabs_repo; +extern Fl_Menu_Button* comment_predefined_2; +extern Fl_Button* comment_load_2; +extern Fl_Tabs* class_tabs; +extern Fl_Group* class_tabs_main; +extern Fl_Tabs* declblock_tabs; +extern Fl_Group* declblock_tabs_main; +extern Fl_Tabs* decl_tabs; +extern Fl_Group* decl_tabs_main; +extern Fl_Tabs* codeblock_tabs; +extern Fl_Group* codeblock_tabs_main; +extern Fl_Tabs* code_tabs; +extern Fl_Group* code_tabs_main; +extern Fl_Tabs* func_tabs; +extern Fl_Group* func_tabs_main; +extern Fl_Tabs* widget_tabs_repo; extern void live_mode_cb(Fl_Button*, void*); -extern Fl_Button *wLiveMode; +extern Fl_Button* wLiveMode; extern void overlay_cb(Fl_Button*, void*); -extern Fl_Button *overlay_button; +extern Fl_Button* overlay_button; #include extern void ok_cb(Fl_Return_Button*, void*); Fl_Double_Window* make_widget_panel(); diff --git a/fluid/tools/autodoc.cxx b/fluid/tools/autodoc.cxx index 4c1dc5bff..275ae5e12 100644 --- a/fluid/tools/autodoc.cxx +++ b/fluid/tools/autodoc.cxx @@ -407,7 +407,7 @@ void run_autodoc(const std::string &target_dir) { t_comment->name("All work and no play make Jack a dull boy."); Node *t_class = add_new_widget_from_user("Class", Strategy::AS_LAST_CHILD, false); Node *t_decl = add_new_widget_from_user("Decl", Strategy::AS_LAST_CHILD, false); - t_decl->name("const char *damage = \"'tis but a scratch\";"); + t_decl->name("const char* damage = \"'tis but a scratch\";"); Node *t_func = add_new_widget_from_user("Function", Strategy::AS_LAST_CHILD, false); Node *t_code = add_new_widget_from_user("Code", Strategy::AS_LAST_CHILD, false); t_code->name("// increment user count\nif (new_user) {\n user_count++;\n}\n"); diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx index ea116319d..abd71c9f6 100644 --- a/src/Fl_File_Chooser.cxx +++ b/src/Fl_File_Chooser.cxx @@ -61,8 +61,8 @@ void Fl_File_Chooser::cb_newButton(Fl_Button* o, void* v) { static const unsigned char idata_new[] = {0,0,120,0,132,0,2,1,1,254,1,128,49,128,49,128,253,128,253,128,49,128,49, 128,1,128,1,128,255,255,0,0}; -static Fl_Image *image_new() { - static Fl_Image *image = NULL; +static Fl_Image* image_new() { + static Fl_Image* image = nullptr; if (!image) image = new Fl_Bitmap(idata_new, 32, 16, 16); return image; diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl index 1328733c9..5f01eca34 100644 --- a/src/Fl_File_Chooser.fl +++ b/src/Fl_File_Chooser.fl @@ -2,6 +2,7 @@ version 1.0500 header_name {../FL/Fl_File_Chooser.H} code_name {.cxx} +include_guard {} comment {// // Fl_File_Chooser dialog for the Fast Light Tool Kit (FLTK). //