commit e8961f10b87290ce9a0b9efc1a0439760b3b2e60
Author:     Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Sun Dec 19 22:43:36 2021 +0100
Commit:     Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Sun Dec 19 22:45:53 2021 +0100

    Update fluid generated and .fl files (remove mac_shell...)
    
    Commit updated .cxx files in src/ with fixed indenting
    
    Remove `mac_shell_*' statements from fluid (.fl) files

 fluid/about_panel.fl    |   2 -
 fluid/function_panel.fl |   2 -
 fluid/template_panel.fl |   2 -
 fluid/widget_panel.fl   |   2 -
 src/Fl_File_Chooser.cxx |  18 ++++----
 src/Fl_Help_Dialog.cxx  | 106 ++++++++++++++++++++++++------------------------
 6 files changed, 62 insertions(+), 70 deletions(-)

diff --git fluid/about_panel.fl fluid/about_panel.fl
index da76c82..4b519df 100644
--- fluid/about_panel.fl
+++ fluid/about_panel.fl
@@ -2,8 +2,6 @@
 version 1.0400
 header_name {.h}
 code_name {.cxx}
-mac_shell_cmd {echo "Fluid is nice"}
-mac_shell_flags 3
 comment {//
 // About dialog for the Fast Light Tool Kit (FLTK).
 //
diff --git fluid/function_panel.fl fluid/function_panel.fl
index 9bfb274..953bb05 100644
--- fluid/function_panel.fl
+++ fluid/function_panel.fl
@@ -2,8 +2,6 @@
 version 1.0400
 header_name {.h}
 code_name {.cxx}
-mac_shell_cmd {echo "I love Fluid"}
-mac_shell_flags 3
 comment {//
 // Code dialogs for the Fast Light Tool Kit (FLTK).
 //
diff --git fluid/template_panel.fl fluid/template_panel.fl
index 51c07ef..9407a75 100644
--- fluid/template_panel.fl
+++ fluid/template_panel.fl
@@ -2,8 +2,6 @@
 version 1.0400
 header_name {.h}
 code_name {.cxx}
-mac_shell_cmd {echo "Fluid is nice"}
-mac_shell_flags 3
 comment {//
 // FLUID template support for the Fast Light Tool Kit (FLTK).
 //
diff --git fluid/widget_panel.fl fluid/widget_panel.fl
index e01397f..1e986b2 100644
--- fluid/widget_panel.fl
+++ fluid/widget_panel.fl
@@ -2,8 +2,6 @@
 version 1.0400
 header_name {.h}
 code_name {.cxx}
-mac_shell_cmd {echo "Fluid is nice"}
-mac_shell_flags 3
 comment {//
 // Widget panel for the Fast Light Tool Kit (FLTK).
 //
diff --git src/Fl_File_Chooser.cxx src/Fl_File_Chooser.cxx
index b299363..fb7f396 100644
--- src/Fl_File_Chooser.cxx
+++ src/Fl_File_Chooser.cxx
@@ -28,9 +28,9 @@
 
 void Fl_File_Chooser::cb_window_i(Fl_Double_Window*, void*) {
   fileName->value("");
-fileList->deselect();
-Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
-window->hide();
+  fileList->deselect();
+  Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
+  window->hide();
 }
 void Fl_File_Chooser::cb_window(Fl_Double_Window* o, void* v) {
   ((Fl_File_Chooser*)(o->user_data()))->cb_window_i(o,v);
@@ -104,9 +104,9 @@ void Fl_File_Chooser::cb_fileName(Fl_File_Input* o, void* v) {
 void Fl_File_Chooser::cb_okButton_i(Fl_Return_Button*, void*) {
   window->hide();
 
-// Do any callback that is registered...
-if (callback_)
-  (*callback_)(this, data_);
+  // Do any callback that is registered...
+  if (callback_)
+    (*callback_)(this, data_);
 }
 void Fl_File_Chooser::cb_okButton(Fl_Return_Button* o, void* v) {
   ((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_okButton_i(o,v);
@@ -114,9 +114,9 @@ void Fl_File_Chooser::cb_okButton(Fl_Return_Button* o, void* v) {
 
 void Fl_File_Chooser::cb_cancelButton_i(Fl_Button*, void*) {
   fileName->value("");
-fileList->deselect();
-Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
-window->hide();
+  fileList->deselect();
+  Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
+  window->hide();
 }
 void Fl_File_Chooser::cb_cancelButton(Fl_Button* o, void* v) {
   ((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_cancelButton_i(o,v);
diff --git src/Fl_Help_Dialog.cxx src/Fl_Help_Dialog.cxx
index 54bbee1..3cdba70 100644
--- src/Fl_Help_Dialog.cxx
+++ src/Fl_Help_Dialog.cxx
@@ -30,19 +30,19 @@
 
 void Fl_Help_Dialog::cb_back__i(Fl_Button*, void*) {
   if (index_ > 0)
-  index_ --;
+    index_ --;
 
-if (index_ == 0)
-  back_->deactivate();
+  if (index_ == 0)
+    back_->deactivate();
 
-forward_->activate();
+  forward_->activate();
 
-int l = line_[index_];
+  int l = line_[index_];
 
-if (strcmp(view_->filename(), file_[index_]) != 0)
-  view_->load(file_[index_]);
+  if (strcmp(view_->filename(), file_[index_]) != 0)
+    view_->load(file_[index_]);
 
-view_->topline(l);
+  view_->topline(l);
 }
 void Fl_Help_Dialog::cb_back_(Fl_Button* o, void* v) {
   ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_back__i(o,v);
@@ -50,19 +50,19 @@ void Fl_Help_Dialog::cb_back_(Fl_Button* o, void* v) {
 
 void Fl_Help_Dialog::cb_forward__i(Fl_Button*, void*) {
   if (index_ < max_)
-  index_ ++;
+    index_ ++;
 
-if (index_ >= max_)
-  forward_->deactivate();
+  if (index_ >= max_)
+    forward_->deactivate();
 
-back_->activate();
+  back_->activate();
 
-int l = view_->topline();
+  int l = view_->topline();
 
-if (strcmp(view_->filename(), file_[index_]) != 0)
-  view_->load(file_[index_]);
+  if (strcmp(view_->filename(), file_[index_]) != 0)
+    view_->load(file_[index_]);
 
-view_->topline(l);
+  view_->topline(l);
 }
 void Fl_Help_Dialog::cb_forward_(Fl_Button* o, void* v) {
   ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_forward__i(o,v);
@@ -70,11 +70,11 @@ void Fl_Help_Dialog::cb_forward_(Fl_Button* o, void* v) {
 
 void Fl_Help_Dialog::cb_smaller__i(Fl_Button*, void*) {
   if (view_->textsize() > 8)
-  view_->textsize(view_->textsize() - 2);
+    view_->textsize(view_->textsize() - 2);
 
-if (view_->textsize() <= 8)
-  smaller_->deactivate();
-larger_->activate();
+  if (view_->textsize() <= 8)
+    smaller_->deactivate();
+  larger_->activate();
 }
 void Fl_Help_Dialog::cb_smaller_(Fl_Button* o, void* v) {
   ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_smaller__i(o,v);
@@ -82,11 +82,11 @@ void Fl_Help_Dialog::cb_smaller_(Fl_Button* o, void* v) {
 
 void Fl_Help_Dialog::cb_larger__i(Fl_Button*, void*) {
   if (view_->textsize() < 18)
-  view_->textsize(view_->textsize() + 2);
+    view_->textsize(view_->textsize() + 2);
 
-if (view_->textsize() >= 18)
-  larger_->deactivate();
-smaller_->activate();
+  if (view_->textsize() >= 18)
+    larger_->deactivate();
+  smaller_->activate();
 }
 void Fl_Help_Dialog::cb_larger_(Fl_Button* o, void* v) {
   ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_larger__i(o,v);
@@ -101,43 +101,43 @@ void Fl_Help_Dialog::cb_find_(Fl_Input* o, void* v) {
 
 void Fl_Help_Dialog::cb_view__i(Fl_Help_View*, void*) {
   if (view_->filename())
-{
-  if (view_->changed())
   {
-    index_ ++;
-
-    if (index_ >= 100)
+    if (view_->changed())
     {
-      memmove(line_, line_ + 10, sizeof(line_[0]) * 90);
-      memmove(file_, file_ + 10, sizeof(file_[0]) * 90);
-      index_ -= 10;
-    }
+      index_ ++;
 
-    max_ = index_;
+      if (index_ >= 100)
+      {
+        memmove(line_, line_ + 10, sizeof(line_[0]) * 90);
+        memmove(file_, file_ + 10, sizeof(file_[0]) * 90);
+        index_ -= 10;
+      }
 
-    strlcpy(file_[index_], view_->filename(),sizeof(file_[0]));
-    line_[index_] = view_->topline();
+      max_ = index_;
 
-    if (index_ > 0)
-      back_->activate();
-    else
-      back_->deactivate();
+      strlcpy(file_[index_], view_->filename(),sizeof(file_[0]));
+      line_[index_] = view_->topline();
 
-    forward_->deactivate();
-    window_->label(view_->title());
-  }
-  else // if ! view_->changed()
-  {
-    strlcpy(file_[index_], view_->filename(), sizeof(file_[0]));
+      if (index_ > 0)
+        back_->activate();
+      else
+        back_->deactivate();
+
+      forward_->deactivate();
+      window_->label(view_->title());
+    }
+    else // if ! view_->changed()
+    {
+      strlcpy(file_[index_], view_->filename(), sizeof(file_[0]));
+      line_[index_] = view_->topline();
+    }
+  } else { // if ! view_->filename()
+    index_ = 0; // hitting an internal page will disable the back/fwd buffer
+    file_[index_][0] = 0; // unnamed internal page
     line_[index_] = view_->topline();
+    back_->deactivate();
+    forward_->deactivate();
   }
-} else { // if ! view_->filename()
-  index_ = 0; // hitting an internal page will disable the back/fwd buffer
-  file_[index_][0] = 0; // unnamed internal page
-  line_[index_] = view_->topline();
-  back_->deactivate();
-  forward_->deactivate();
-};
 }
 void Fl_Help_Dialog::cb_view_(Fl_Help_View* o, void* v) {
   ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_view__i(o,v);