Browse Source

GitHub #329: fixed missing code

Commented out code was obsolete.
line_len was a true bug which can shred the end of lines.

Removed Warning
pull/334/head
Matthias Melcher 4 years ago committed by Matthias Melcher
parent
commit
983777535e
  1. 6
      fluid/code.cxx
  2. 17
      fluid/factory.cxx

6
fluid/code.cxx

@ -419,15 +419,15 @@ void write_c_indented(const char *textlines, int inIndent, char inTrailwWith) {
if (newline) if (newline)
line_len = (int)(newline-textlines); line_len = (int)(newline-textlines);
else else
line_len = strlen(textlines); line_len = (int)strlen(textlines);
if (textlines[0]=='\n') { if (textlines[0]=='\n') {
// avoid trailing spaces // avoid trailing spaces
} else if (textlines[0]=='#') { } else if (textlines[0]=='#') {
// don't indent preprocessor statments starting with '#' // don't indent preprocessor statments starting with '#'
write_c("%.*s", (int)(newline-textlines), textlines); write_c("%.*s", line_len, textlines);
} else { } else {
// indent all other text lines // indent all other text lines
write_c("%s%.*s", indent(), (int)(newline-textlines), textlines); write_c("%s%.*s", indent(), line_len, textlines);
} }
if (newline) { if (newline) {
write_c("\n"); write_c("\n");

17
fluid/factory.cxx

@ -1053,7 +1053,6 @@ static Fl_Type *known_types[] = {
Fl_Type *add_new_widget_from_user(Fl_Type *inPrototype, Strategy strategy) { Fl_Type *add_new_widget_from_user(Fl_Type *inPrototype, Strategy strategy) {
undo_checkpoint(); undo_checkpoint();
undo_suspend(); undo_suspend();
Fl_Type *ins = Fl_Type::current;
Fl_Type *t = ((Fl_Type*)inPrototype)->make(strategy); Fl_Type *t = ((Fl_Type*)inPrototype)->make(strategy);
if (t) { if (t) {
if (t->is_widget() && !t->is_window()) { if (t->is_widget() && !t->is_window()) {
@ -1087,22 +1086,6 @@ Fl_Type *add_new_widget_from_user(Fl_Type *inPrototype, Strategy strategy) {
} }
} }
} }
#if 0
// Fluid inserts widgets always as the last child of a matching group.
// This is great when reading a file, but if users do thins interactively,
// they expect the new widget close to where they worked previously.
if (ins) {
// if the new and current widget are siblings, just move it here.
if (ins->level==t->level) {
Fl_Type *c;
for (c=t; c && c!=ins && c->level>=t->level; c=c->prev) { }
if (c==ins) {
t->move_before(ins); // together the same as 'move_after'
ins->move_before(t);
}
}
}
#endif
// make the new widget visible // make the new widget visible
select_only(t); select_only(t);
set_modflag(1); set_modflag(1);

Loading…
Cancel
Save