Author: manolo
Date: 2011-06-07 04:41:36 -0700 (Tue, 07 Jun 2011)
New Revision: 8786
Log:
Fix STR #2657: repaired indentation error in fluid-output code.
Also changed copyright year to 2011.
Modified:
branches/branch-1.3/FL/Fl_File_Chooser.H
branches/branch-1.3/fluid/Fl_Function_Type.cxx
branches/branch-1.3/src/Fl_File_Chooser.cxx
branches/branch-1.3/src/Fl_File_Chooser.fl
Modified: branches/branch-1.3/FL/Fl_File_Chooser.H
===================================================================
--- branches/branch-1.3/FL/Fl_File_Chooser.H 2011-06-06 16:11:22 UTC (rev
8785)
+++ branches/branch-1.3/FL/Fl_File_Chooser.H 2011-06-07 11:41:36 UTC (rev
8786)
@@ -3,7 +3,7 @@
//
// Fl_File_Chooser dialog for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2011 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
Modified: branches/branch-1.3/fluid/Fl_Function_Type.cxx
===================================================================
--- branches/branch-1.3/fluid/Fl_Function_Type.cxx 2011-06-06 16:11:22 UTC
(rev 8785)
+++ branches/branch-1.3/fluid/Fl_Function_Type.cxx 2011-06-07 11:41:36 UTC
(rev 8786)
@@ -3,7 +3,7 @@
//
// C function type code for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2011 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
@@ -552,7 +552,7 @@
}
void Fl_CodeBlock_Type::write_code2() {
- indentation += 2;
+ indentation -= 2;
if (after) write_c("%s} %s\n", indent(), after);
else write_c("%s}\n", indent());
}
Modified: branches/branch-1.3/src/Fl_File_Chooser.cxx
===================================================================
--- branches/branch-1.3/src/Fl_File_Chooser.cxx 2011-06-06 16:11:22 UTC (rev
8785)
+++ branches/branch-1.3/src/Fl_File_Chooser.cxx 2011-06-07 11:41:36 UTC (rev
8786)
@@ -3,7 +3,7 @@
//
// Fl_File_Chooser dialog for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2011 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
@@ -447,27 +447,27 @@
Fl_Widget* ret=ext_group;
if (gr==ext_group) {
return ret;
- }
- if (ext_group) {
- int sh=ext_group->h()+4;
- Fl_Widget* svres=window->resizable();
- window->resizable(NULL);
- window->size(window->w(),window->h()-sh);
- window->remove(ext_group);
- ext_group=NULL;
- window->resizable(svres);
- }
- if (gr) {
- int nh=window->h()+gr->h()+4;
- Fl_Widget* svres=window->resizable();
- window->resizable(NULL);
- window->size(window->w(),nh);
- gr->position(2,okButton->y()+okButton->h()+2);
- window->add(gr);
- ext_group=gr;
- window->resizable(svres);
- }
- return ret;
+ }
+ if (ext_group) {
+ int sh=ext_group->h()+4;
+ Fl_Widget* svres=window->resizable();
+ window->resizable(NULL);
+ window->size(window->w(),window->h()-sh);
+ window->remove(ext_group);
+ ext_group=NULL;
+ window->resizable(svres);
+ }
+ if (gr) {
+ int nh=window->h()+gr->h()+4;
+ Fl_Widget* svres=window->resizable();
+ window->resizable(NULL);
+ window->size(window->w(),nh);
+ gr->position(2,okButton->y()+okButton->h()+2);
+ window->add(gr);
+ ext_group=gr;
+ window->resizable(svres);
+ }
+ return ret;
}
//
Modified: branches/branch-1.3/src/Fl_File_Chooser.fl
===================================================================
--- branches/branch-1.3/src/Fl_File_Chooser.fl 2011-06-06 16:11:22 UTC (rev
8785)
+++ branches/branch-1.3/src/Fl_File_Chooser.fl 2011-06-07 11:41:36 UTC (rev
8786)
@@ -7,7 +7,7 @@
//
// Fl_File_Chooser dialog for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2011 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
