summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2011-06-07 11:41:36 +0000
committerManolo Gouy <Manolo>2011-06-07 11:41:36 +0000
commit75c9d386faed27812dba5cd3807155fdd9b9898b (patch)
tree087cb2491f7fa651b5c177cea5a9076953a235e0
parent7feb5a9dfeeae416cb86e7019ffda697c94c8f90 (diff)
Fix STR #2657: repaired indentation error in fluid-output code.
Also changed copyright year to 2011. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8786 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--FL/Fl_File_Chooser.H2
-rw-r--r--fluid/Fl_Function_Type.cxx4
-rw-r--r--src/Fl_File_Chooser.cxx44
-rw-r--r--src/Fl_File_Chooser.fl2
4 files changed, 26 insertions, 26 deletions
diff --git a/FL/Fl_File_Chooser.H b/FL/Fl_File_Chooser.H
index 9fdd1246e..a13e433ce 100644
--- a/FL/Fl_File_Chooser.H
+++ b/FL/Fl_File_Chooser.H
@@ -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
diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx
index 35ad98a37..60a022910 100644
--- a/fluid/Fl_Function_Type.cxx
+++ b/fluid/Fl_Function_Type.cxx
@@ -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_code1() {
}
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());
}
diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx
index 8ef6e15ca..d0f649c80 100644
--- a/src/Fl_File_Chooser.cxx
+++ b/src/Fl_File_Chooser.cxx
@@ -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* Fl_File_Chooser::add_extra(Fl_Widget* gr) {
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;
}
//
diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl
index c0d14fe3f..34b960675 100644
--- a/src/Fl_File_Chooser.fl
+++ b/src/Fl_File_Chooser.fl
@@ -7,7 +7,7 @@ comment {//
//
// 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