mirror of
https://github.com/fltk/fltk.git
synced 2026-05-31 05:35:29 +08:00
Improve Fluid formatting (#1448)
* change pointer type formatting * change 0, NULL, and 0L into nullptr
This commit is contained in:
Matthias Melcher
GitHub
+19
-19
@@ -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:
|
||||
|
||||
@@ -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 <FL/Fl_Pixmap.H>\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);
|
||||
|
||||
@@ -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 <locale.h>\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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 <string>");
|
||||
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 <string>");
|
||||
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 <string>");
|
||||
if (static_) f.write_c("static ");
|
||||
|
||||
@@ -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",
|
||||
|
||||
+28
-11
@@ -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()
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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 <FL/Fl_Anim_GIF_Image.H>
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <time.h>
|
||||
#include <FL/Fl_Double_Window.H>
|
||||
#include "../src/flstring.h"
|
||||
extern Fl_Double_Window *about_panel;
|
||||
extern Fl_Double_Window* about_panel;
|
||||
#include <FL/Fl_Box.H>
|
||||
#include <FL/Fl_Button.H>
|
||||
#include <FL/Fl_Return_Button.H>
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -28,29 +28,29 @@ void codeview_defer_update();
|
||||
void codeview_toggle_visibility();
|
||||
#include <FL/Fl_Double_Window.H>
|
||||
extern void toggle_codeview_cb(Fl_Double_Window*, void*);
|
||||
extern Fl_Double_Window *codeview_panel;
|
||||
extern Fl_Double_Window* codeview_panel;
|
||||
#include <FL/Fl_Tabs.H>
|
||||
extern Fl_Tabs *cv_tab;
|
||||
extern Fl_Tabs* cv_tab;
|
||||
#include <FL/Fl_Group.H>
|
||||
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 <FL/Fl_Button.H>
|
||||
extern Fl_Button *cv_find_text_case;
|
||||
extern Fl_Button* cv_find_text_case;
|
||||
#include <FL/Fl_Input.H>
|
||||
extern Fl_Input *cv_find_text;
|
||||
extern Fl_Input* cv_find_text;
|
||||
#include <FL/Fl_Box.H>
|
||||
extern Fl_Group *cv_settings_row;
|
||||
extern Fl_Group* cv_settings_row;
|
||||
#include <FL/Fl_Light_Button.H>
|
||||
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 <FL/Fl_Choice.H>
|
||||
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[];
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -501,5 +501,5 @@ else
|
||||
}
|
||||
|
||||
comment {
|
||||
//} {in_source in_header
|
||||
//} {selected in_source in_header
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <FL/Fl.H>
|
||||
void type_make_cb(Fl_Widget*,void*d);
|
||||
#include <FL/Fl_Window.H>
|
||||
extern Fl_Window *widgetbin_panel;
|
||||
extern Fl_Window* widgetbin_panel;
|
||||
#include <FL/Fl_Group.H>
|
||||
#include <FL/Fl_Button.H>
|
||||
Fl_Window* make_widgetbin();
|
||||
|
||||
+123
-123
File diff suppressed because it is too large
Load Diff
@@ -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 <FL/Fl_Double_Window.H>
|
||||
extern Fl_Double_Window *script_panel;
|
||||
extern Fl_Double_Window* script_panel;
|
||||
#include <FL/Fl_Text_Editor.H>
|
||||
extern Fl_Text_Editor *script_input;
|
||||
extern Fl_Text_Editor* script_input;
|
||||
#include <FL/Fl_Group.H>
|
||||
extern void propagate_load(Fl_Group*, void*);
|
||||
#include <FL/Fl_Button.H>
|
||||
extern Fl_Button *script_panel_cancel;
|
||||
extern Fl_Button* script_panel_cancel;
|
||||
#include <FL/Fl_Return_Button.H>
|
||||
extern Fl_Return_Button *script_panel_ok;
|
||||
extern Fl_Return_Button* script_panel_ok;
|
||||
#include <FL/Fl_Box.H>
|
||||
Fl_Double_Window* make_script_panel();
|
||||
extern Fl_Double_Window *settings_window;
|
||||
extern Fl_Double_Window* settings_window;
|
||||
#include <FL/Fl_Tabs.H>
|
||||
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 <FL/Fl_Check_Button.H>
|
||||
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 <FL/Fl_Spinner.H>
|
||||
extern Fl_Spinner *recent_spinner;
|
||||
extern Fl_Spinner* recent_spinner;
|
||||
#include <FL/Fl_Input.H>
|
||||
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 <FL/Fl_Choice.H>
|
||||
extern Fl_Choice *layout_choice;
|
||||
extern Fl_Choice* layout_choice;
|
||||
#include <FL/Fl_Menu_Button.H>
|
||||
extern Fl_Menu_Button *w_layout_menu;
|
||||
extern Fl_Menu_Button* w_layout_menu;
|
||||
#include <FL/Fl_Native_File_Chooser.H>
|
||||
extern void edit_layout_preset_cb(Fl_Button*, void*);
|
||||
extern Fl_Button *preset_choice[3];
|
||||
extern Fl_Button* preset_choice[3];
|
||||
#include <FL/Fl_Value_Input.H>
|
||||
extern Fl_Menu_Item fontmenu_w_default[];
|
||||
extern Fl_Group *w_settings_shell_tab;
|
||||
extern Fl_Group* w_settings_shell_tab;
|
||||
#include <FL/Fl_Browser.H>
|
||||
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 <FL/Fl_Shortcut_Button.H>
|
||||
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 <FL/Fl_Int_Input.H>
|
||||
extern Fl_Int_Input *i18n_pos_set_input;
|
||||
extern Fl_Int_Input* i18n_pos_set_input;
|
||||
#include <FL/fl_show_colormap.H>
|
||||
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 <FL/Fl_Terminal.H>
|
||||
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
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <unistd.h>
|
||||
#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();
|
||||
|
||||
@@ -20,19 +20,19 @@
|
||||
#define template_panel_h
|
||||
#include <FL/Fl.H>
|
||||
#include <FL/Fl_Double_Window.H>
|
||||
extern Fl_Double_Window *template_panel;
|
||||
extern Fl_Double_Window* template_panel;
|
||||
#include <FL/Fl_Browser.H>
|
||||
extern Fl_Browser *template_browser;
|
||||
extern Fl_Browser* template_browser;
|
||||
#include <FL/Fl_Box.H>
|
||||
extern Fl_Box *template_preview;
|
||||
extern Fl_Box* template_preview;
|
||||
#include <FL/Fl_Input.H>
|
||||
extern Fl_Input *template_name;
|
||||
extern Fl_Input *template_instance;
|
||||
extern Fl_Input* template_name;
|
||||
extern Fl_Input* template_instance;
|
||||
#include <FL/Fl_Group.H>
|
||||
#include <FL/Fl_Button.H>
|
||||
extern Fl_Button *template_delete;
|
||||
extern Fl_Button* template_delete;
|
||||
#include <FL/Fl_Return_Button.H>
|
||||
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 *);
|
||||
|
||||
+217
-217
File diff suppressed because it is too large
Load Diff
+73
-73
@@ -24,116 +24,116 @@
|
||||
#include "widgets/Formula_Input.h"
|
||||
class Fl_Flex;
|
||||
#include <FL/Fl_Double_Window.H>
|
||||
extern Fl_Double_Window *image_panel_window;
|
||||
extern Fl_Double_Window* image_panel_window;
|
||||
#include <FL/Fl_Group.H>
|
||||
extern void propagate_load(Fl_Group*, void*);
|
||||
extern Fl_Group *image_panel_imagegroup;
|
||||
extern Fl_Group* image_panel_imagegroup;
|
||||
#include <FL/Fl_Box.H>
|
||||
#include <FL/Fl_Shared_Image.H>
|
||||
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 <FL/Fl_Button.H>
|
||||
#include <FL/Fl_Check_Button.H>
|
||||
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 <FL/Fl_Wizard.H>
|
||||
extern Fl_Wizard *tabs_wizard;
|
||||
extern Fl_Wizard* tabs_wizard;
|
||||
#include <FL/Fl_Tabs.H>
|
||||
extern Fl_Tabs *widget_tabs;
|
||||
extern Fl_Group *wp_gui_tab;
|
||||
extern Fl_Tabs* widget_tabs;
|
||||
extern Fl_Group* wp_gui_tab;
|
||||
#include <FL/Fl_Input.H>
|
||||
extern void label_cb(Fl_Input*, void*);
|
||||
extern Fl_Input *wp_gui_label;
|
||||
extern Fl_Input* wp_gui_label;
|
||||
#include <FL/Fl_Choice.H>
|
||||
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 <FL/Fl_Value_Input.H>
|
||||
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 <FL/Fl_Shortcut_Button.H>
|
||||
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 <FL/Fl_Light_Button.H>
|
||||
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 <FL/Fl_Menu_Button.H>
|
||||
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 <FL/Fl_Tile.H>
|
||||
#include <FL/Fl_Text_Editor.H>
|
||||
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 <FL/Fl_Input_Choice.H>
|
||||
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 <FL/fl_string_functions.h>
|
||||
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 <FL/Fl_Return_Button.H>
|
||||
extern void ok_cb(Fl_Return_Button*, void*);
|
||||
Fl_Double_Window* make_widget_panel();
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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).
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user