Enable and fix extra and pedantic warnings.

fluid/CMakeLists.txt

@@ -137,6 +137,14 @@ else()
 
 endif()
 
+if (MSVC)
+    target_compile_options(fluid-lib PRIVATE /W4 /WX)
+    target_compile_options(fluid PRIVATE /W4 /WX)
+else()
+    target_compile_options(fluid-lib PRIVATE -std=c++11 -Wall -Wextra -pedantic -Werror -Wno-missing-field-initializers)
+    target_compile_options(fluid PRIVATE -std=c++11 -Wall -Wextra -pedantic -Werror -Wno-missing-field-initializers)
+endif()
+
 target_link_libraries(fluid PRIVATE fluid-lib)
 
 # Build the console app on Windows

fluid/Fd_Snap_Action.cxx

@@ -1410,6 +1410,7 @@ class Fd_Snap_Window_Grid : public Fd_Snap_Grid {
                                  layout->top_window_margin, layout->window_grid_y, d.win->o->h()-layout->bottom_window_margin);
   }
   void draw(Fd_Snap_Data &d) FL_OVERRIDE {
+    (void)d;
     draw_grid(nearest_x, nearest_y, layout->window_grid_x, layout->window_grid_y);
   };
 };
@@ -1428,7 +1429,7 @@ class Fd_Snap_Group_Grid : public Fd_Snap_Grid {
                  g->y()+layout->top_group_margin, layout->group_grid_y, g->y()+g->h()-layout->bottom_group_margin);
     }
   }
-  void draw(Fd_Snap_Data &d) FL_OVERRIDE {
+  void draw(Fd_Snap_Data &) FL_OVERRIDE {
     draw_grid(nearest_x, nearest_y, layout->group_grid_x, layout->group_grid_y);
   };
 };
@@ -1482,7 +1483,7 @@ class Fd_Snap_Siblings_Left_Same : public Fd_Snap_Sibling {
   int sibling_check(Fd_Snap_Data &d, Fl_Widget *s) FL_OVERRIDE {
     return check_x_(d, d.bx, s->x());
   }
-  void draw(Fd_Snap_Data &d) FL_OVERRIDE {
+  void draw(Fd_Snap_Data &) FL_OVERRIDE {
     if (best_match) draw_left_brace(best_match);
   };
 };
@@ -1498,7 +1499,7 @@ class Fd_Snap_Siblings_Left : public Fd_Snap_Sibling {
     return fd_min(check_x_(d, d.bx, s->x()+s->w()),
                   check_x_(d, d.bx, s->x()+s->w()+layout->widget_gap_x) );
   }
-  void draw(Fd_Snap_Data &d) FL_OVERRIDE {
+  void draw(Fd_Snap_Data &) FL_OVERRIDE {
     if (best_match) draw_right_brace(best_match);
   };
 };
@@ -1510,7 +1511,7 @@ class Fd_Snap_Siblings_Right_Same : public Fd_Snap_Sibling {
   int sibling_check(Fd_Snap_Data &d, Fl_Widget *s) FL_OVERRIDE {
     return check_x_(d, d.br, s->x()+s->w());
   }
-  void draw(Fd_Snap_Data &d) FL_OVERRIDE {
+  void draw(Fd_Snap_Data &) FL_OVERRIDE {
     if (best_match) draw_right_brace(best_match);
   };
 };
@@ -1523,7 +1524,7 @@ class Fd_Snap_Siblings_Right : public Fd_Snap_Sibling {
     return fd_min(check_x_(d, d.br, s->x()),
                   check_x_(d, d.br, s->x()-layout->widget_gap_x));
   }
-  void draw(Fd_Snap_Data &d) FL_OVERRIDE {
+  void draw(Fd_Snap_Data &) FL_OVERRIDE {
     if (best_match) draw_left_brace(best_match);
   };
 };
@@ -1535,7 +1536,7 @@ class Fd_Snap_Siblings_Top_Same : public Fd_Snap_Sibling {
   int sibling_check(Fd_Snap_Data &d, Fl_Widget *s) FL_OVERRIDE {
     return check_y_(d, d.by, s->y());
   }
-  void draw(Fd_Snap_Data &d) FL_OVERRIDE {
+  void draw(Fd_Snap_Data &) FL_OVERRIDE {
     if (best_match) draw_top_brace(best_match);
   };
 };
@@ -1548,7 +1549,7 @@ class Fd_Snap_Siblings_Top : public Fd_Snap_Sibling {
     return fd_min(check_y_(d, d.by, s->y()+s->h()),
                   check_y_(d, d.by, s->y()+s->h()+layout->widget_gap_y));
   }
-  void draw(Fd_Snap_Data &d) FL_OVERRIDE {
+  void draw(Fd_Snap_Data &) FL_OVERRIDE {
     if (best_match) draw_bottom_brace(best_match);
   };
 };
@@ -1560,7 +1561,7 @@ class Fd_Snap_Siblings_Bottom_Same : public Fd_Snap_Sibling {
   int sibling_check(Fd_Snap_Data &d, Fl_Widget *s) FL_OVERRIDE {
     return check_y_(d, d.bt, s->y()+s->h());
   }
-  void draw(Fd_Snap_Data &d) FL_OVERRIDE {
+  void draw(Fd_Snap_Data &) FL_OVERRIDE {
     if (best_match) draw_bottom_brace(best_match);
   };
 };
@@ -1573,7 +1574,7 @@ class Fd_Snap_Siblings_Bottom : public Fd_Snap_Sibling {
     return fd_min(check_y_(d, d.bt, s->y()),
                   check_y_(d, d.bt, s->y()-layout->widget_gap_y));
   }
-  void draw(Fd_Snap_Data &d) FL_OVERRIDE {
+  void draw(Fd_Snap_Data &) FL_OVERRIDE {
     if (best_match) draw_top_brace(best_match);
   };
 };

fluid/Fd_Snap_Action.h

@@ -178,7 +178,7 @@ class Fd_Snap_Action {
   Fd_Snap_Action() : ex(0x7fff), ey(0x7fff), dx(128), dy(128), type(0), mask(0) { }
   virtual ~Fd_Snap_Action() { }
   virtual void check(Fd_Snap_Data &d) = 0;
-  virtual void draw(Fd_Snap_Data &d) { }
+  virtual void draw(Fd_Snap_Data &d) { (void)d; }
   virtual bool matches(Fd_Snap_Data &d);
 public:
   static int eex, eey;

fluid/Fl_Function_Type.h

@@ -85,7 +85,7 @@ class Fl_Code_Type : public Fl_Type
   Fl_Type *make(Strategy strategy) FL_OVERRIDE;
   void write(Fd_Project_Writer &f) FL_OVERRIDE;
   void write_code1(Fd_Code_Writer& f) FL_OVERRIDE;
-  void write_code2(Fd_Code_Writer& f) FL_OVERRIDE { }
+  void write_code2(Fd_Code_Writer& f) FL_OVERRIDE { (void)f; }
   void open() FL_OVERRIDE;
   const char *type_name() FL_OVERRIDE {return "code";}
   int is_code_block() const FL_OVERRIDE {return 0;}
@@ -135,7 +135,7 @@ class Fl_Decl_Type : public Fl_Type
   Fl_Decl_Type();
   Fl_Type *make(Strategy strategy) FL_OVERRIDE;
   void write_code1(Fd_Code_Writer& f) FL_OVERRIDE;
-  void write_code2(Fd_Code_Writer& f) FL_OVERRIDE { }
+  void write_code2(Fd_Code_Writer& f) FL_OVERRIDE { (void)f; }
   void open() FL_OVERRIDE;
   const char *type_name() FL_OVERRIDE {return "decl";}
   void write_properties(Fd_Project_Writer &f) FL_OVERRIDE;
@@ -158,7 +158,7 @@ class Fl_Data_Type : public Fl_Decl_Type
   ~Fl_Data_Type();
   Fl_Type *make(Strategy strategy) FL_OVERRIDE;
   void write_code1(Fd_Code_Writer& f) FL_OVERRIDE;
-  void write_code2(Fd_Code_Writer& f) FL_OVERRIDE {}
+  void write_code2(Fd_Code_Writer& f) FL_OVERRIDE { (void)f; }
   void open() FL_OVERRIDE;
   const char *type_name() FL_OVERRIDE {return "data";}
   void write_properties(Fd_Project_Writer &f) FL_OVERRIDE;
@@ -203,7 +203,7 @@ class Fl_Comment_Type : public Fl_Type
   Fl_Comment_Type();
   Fl_Type *make(Strategy strategy) FL_OVERRIDE;
   void write_code1(Fd_Code_Writer& f) FL_OVERRIDE;
-  void write_code2(Fd_Code_Writer& f) FL_OVERRIDE { }
+  void write_code2(Fd_Code_Writer& f) FL_OVERRIDE { (void)f; }
   void open() FL_OVERRIDE;
   const char *type_name() FL_OVERRIDE {return "comment";}
   void write_properties(Fd_Project_Writer &f) FL_OVERRIDE;

fluid/Fl_Grid_Type.cxx

@@ -820,13 +820,13 @@ void grid_set_row_cb(Fluid_Coord_Input* i, void* v) {
   grid_child_cb(i, v, 8);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
-void grid_dec_row_cb(Fl_Button* i, void* v) {
+void grid_dec_row_cb(Fl_Button*, void* v) {
   if (v!=LOAD) {
     grid_child_cb(widget_grid_row_input, v, 0x0100 + 8);
     widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
   }
 }
-void grid_inc_row_cb(Fl_Button* i, void* v) {
+void grid_inc_row_cb(Fl_Button*, void* v) {
   if (v!=LOAD) {
     grid_child_cb(widget_grid_row_input, v, 0x0200 + 8);
     widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
@@ -836,13 +836,13 @@ void grid_set_col_cb(Fluid_Coord_Input* i, void* v) {
   grid_child_cb(i, v, 9);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
-void grid_dec_col_cb(Fl_Button* i, void* v) {
+void grid_dec_col_cb(Fl_Button*, void* v) {
   if (v!=LOAD) {
     grid_child_cb(widget_grid_col_input, v, 0x0100 + 9);
     widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
   }
 }
-void grid_inc_col_cb(Fl_Button* i, void* v) {
+void grid_inc_col_cb(Fl_Button*, void* v) {
   if (v!=LOAD) {
     grid_child_cb(widget_grid_col_input, v, 0x0200 + 9);
     widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
@@ -852,13 +852,13 @@ void grid_set_rowspan_cb(Fluid_Coord_Input* i, void* v) {
   grid_child_cb(i, v, 10);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
-void grid_dec_rowspan_cb(Fl_Button* i, void* v) {
+void grid_dec_rowspan_cb(Fl_Button*, void* v) {
   if (v!=LOAD) {
     grid_child_cb(widget_grid_rowspan_input, v, 0x0100 + 10);
     widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
   }
 }
-void grid_inc_rowspan_cb(Fl_Button* i, void* v) {
+void grid_inc_rowspan_cb(Fl_Button*, void* v) {
   if (v!=LOAD) {
     grid_child_cb(widget_grid_rowspan_input, v, 0x0200 + 10);
     widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
@@ -868,13 +868,13 @@ void grid_set_colspan_cb(Fluid_Coord_Input* i, void* v) {
   grid_child_cb(i, v, 11);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
-void grid_dec_colspan_cb(Fl_Button* i, void* v) {
+void grid_dec_colspan_cb(Fl_Button*, void* v) {
   if (v!=LOAD) {
     grid_child_cb(widget_grid_colspan_input, v, 0x0100 + 11);
     widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
   }
 }
-void grid_inc_colspan_cb(Fl_Button* i, void* v) {
+void grid_inc_colspan_cb(Fl_Button*, void* v) {
   if (v!=LOAD) {
     grid_child_cb(widget_grid_colspan_input, v, 0x0200 + 11);
     widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);

fluid/Fl_Type.h

@@ -191,8 +191,8 @@ class Fl_Type {
 
   virtual Fl_Type* click_test(int,int) { return NULL; }
 
-  virtual void add_child(Fl_Type*, Fl_Type* beforethis) { }
-  virtual void move_child(Fl_Type*, Fl_Type* beforethis) { }
+  virtual void add_child(Fl_Type*, Fl_Type* beforethis) { (void)beforethis; }
+  virtual void move_child(Fl_Type*, Fl_Type* beforethis) { (void)beforethis; }
   virtual void remove_child(Fl_Type*) { }
 
   /** Give widgets a change to arrange their children after all children were add.

fluid/Fl_Widget_Type.cxx

@@ -624,6 +624,7 @@ Fluid_Coord_Input *x_input, *y_input, *w_input, *h_input;
 static int widget_i = 0;
 
 static int vars_i_cb(const Fluid_Coord_Input*, void *v) {
+  (void)v; 
   return widget_i;
 }
 

fluid/Fl_Window_Type.cxx

@@ -783,6 +783,8 @@ void toggle_guides(Fl_Widget *,void *) {
  This is called from the check button in the Settings dialog.
  */
 void toggle_guides_cb(Fl_Check_Button *o, void *v) {
+  (void)o;
+  (void)v;
   toggle_guides(NULL, NULL);
 }
 
@@ -829,6 +831,8 @@ void toggle_ghosted_outline_cb(Fl_Check_Button *,void *) {
  This is called from the check button in the Settings dialog.
  */
 void toggle_restricted_cb(Fl_Check_Button *o, void *v) {
+  (void)o;
+  (void)v; 
   toggle_restricted(NULL, NULL);
 }
 

fluid/Fluid_Image.cxx

@@ -282,6 +282,7 @@ void Fluid_Image::write_code(Fd_Code_Writer& f, int bind, const char *var, int i
 }
 
 void Fluid_Image::write_inline(Fd_Code_Writer& f, int inactive) {
+  (void)inactive; 
   if (img)
     f.write_c("%s()", function_name_);
 }

fluid/alignment_panel.cxx

@@ -1158,6 +1158,7 @@ Fl_Menu_Item menu_Condition[] = {
 };
 
 static void cb_Label(Fl_Input* o, void* v) {
+  (void)o;
   if (v == LOAD) {
   //  o->value(g_shell_command.c_str());
   } else {
@@ -2438,6 +2439,7 @@ Fl_Double_Window* make_settings_window() {
         o->image( image_general_64() );
         o->image()->scale(36, 24, 0, 1);
         o->labelsize(11);
+        o->hide();
         { Fl_Group* o = new Fl_Group(120, 78, 130, 25);
           o->callback((Fl_Callback*)cb_);
           { scheme_choice = new Fl_Scheme_Choice(120, 78, 120, 25, "Scheme: ");
@@ -2999,7 +3001,6 @@ itional data in code and project files.");
         w_settings_shell_tab->image()->scale(36, 24, 0, 1);
         w_settings_shell_tab->labelsize(11);
         w_settings_shell_tab->callback((Fl_Callback*)propagate_load);
-        w_settings_shell_tab->hide();
         { Fl_Group* o = new Fl_Group(10, 90, 320, 132);
           o->callback((Fl_Callback*)propagate_load);
           { w_settings_shell_list = new Fl_Browser(100, 90, 220, 110, "Shell\ncommand\nlist:");

fluid/alignment_panel.fl

@@ -196,8 +196,8 @@ Function {make_settings_window()} {open
       xywh {10 10 320 530} selection_color 12 labelsize 11 labelcolor 255 resizable
     } {
       Fl_Group {} {
-        label General open selected
-        scale_image {36 24} image {icons/general_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 resizable
+        label General open
+        scale_image {36 24} image {icons/general_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 hide resizable
       } {
         Fl_Group {} {
           callback {propagate_load(o, v);} open
@@ -893,7 +893,7 @@ g_layout_list.update_dialogs();}
       Fl_Group w_settings_shell_tab {
         label Shell
         callback propagate_load open
-        scale_image {36 24} image {icons/shell_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 hide
+        scale_image {36 24} image {icons/shell_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11
       } {
         Fl_Group {} {
           callback propagate_load open
@@ -1244,11 +1244,12 @@ if (v == LOAD) {
           }
           Fl_Input {} {
             label {Label:}
-            callback {if (v == LOAD) {
+            callback {(void)o;
+if (v == LOAD) {
 //  o->value(g_shell_command.c_str());
 } else {
 //  g_shell_command = o->value();
-}}
+}} selected
             xywh {230 348 90 20} labelfont 1 labelsize 11 textfont 4 textsize 11 hide
           }
           Fl_Group {} {

fluid/shell_command.cxx

@@ -713,6 +713,7 @@ void Fd_Shell_Command_List::clear(Fd_Tool_Store storage) {
  Read shell configuration from a preferences group.
  */
 void Fd_Shell_Command_List::read(Fl_Preferences &prefs, Fd_Tool_Store storage) {
+  (void)storage;
   // import the old shell commands from previous user settings
   if (&fluid_prefs == &prefs) {
     int version;
@@ -751,6 +752,7 @@ void Fd_Shell_Command_List::read(Fl_Preferences &prefs, Fd_Tool_Store storage) {
  Write shell configuration to a preferences group.
  */
 void Fd_Shell_Command_List::write(Fl_Preferences &prefs, Fd_Tool_Store storage) {
+  (void)storage; 
   Fl_Preferences shell_commands(prefs, "shell_commands");
   shell_commands.delete_all_groups();
   int index = 0;

fluid/widget_panel.cxx

@@ -520,6 +520,7 @@ Fluid_Coord_Input *widget_grid_col_input=(Fluid_Coord_Input *)0;
 Fl_Box *widget_grid_transient=(Fl_Box *)0;
 
 static void cb_widget_grid_transient(Fl_Box* o, void* v) {
+  (void)o; 
   if (v==LOAD) {
     Fl_Widget *child = ((Fl_Widget_Type*)current_widget)->o;
     Fl_Grid_Proxy *g = ((Fl_Grid_Proxy*)((Fl_Widget_Type*)current_widget->parent)->o);