wip

1 files changed, 60 insertions, 60 deletions

diff --git a/fluid/app/Snap_Action.cxx b/fluid/app/Snap_Action.cxx
index 3e71d91c5..f045d325f 100644
--- a/fluid/app/Snap_Action.cxx
+++ b/fluid/app/Snap_Action.cxx
@@ -1174,8 +1174,8 @@ public:
  */
 class Fd_Snap_Left_Window_Edge : public Fd_Snap_Left {
 public:
-  void check(Snap_Data &d) override { clr(); check_x_(d, d.bx, 0); }
-  void draw(Snap_Data &d) override { draw_left_brace(d.win->o); }
+  void check(Snap_Data &d) { clr(); check_x_(d, d.bx, 0); }
+  void draw(Snap_Data &d) { draw_left_brace(d.win->o); }
 };
 Fd_Snap_Left_Window_Edge snap_left_window_edge;
 
@@ -1184,8 +1184,8 @@ Fd_Snap_Left_Window_Edge snap_left_window_edge;
  */
 class Fd_Snap_Right_Window_Edge : public Fd_Snap_Right {
 public:
-  void check(Snap_Data &d) override { clr(); check_x_(d, d.br, d.win->o->w()); }
-  void draw(Snap_Data &d) override { draw_right_brace(d.win->o); }
+  void check(Snap_Data &d) { clr(); check_x_(d, d.br, d.win->o->w()); }
+  void draw(Snap_Data &d) { draw_right_brace(d.win->o); }
 };
 Fd_Snap_Right_Window_Edge snap_right_window_edge;
 
@@ -1194,8 +1194,8 @@ Fd_Snap_Right_Window_Edge snap_right_window_edge;
  */
 class Fd_Snap_Top_Window_Edge : public Fd_Snap_Top {
 public:
-  void check(Snap_Data &d) override { clr(); check_y_(d, d.by, 0); }
-  void draw(Snap_Data &d) override { draw_top_brace(d.win->o); }
+  void check(Snap_Data &d) { clr(); check_y_(d, d.by, 0); }
+  void draw(Snap_Data &d) { draw_top_brace(d.win->o); }
 };
 Fd_Snap_Top_Window_Edge snap_top_window_edge;
 
@@ -1204,8 +1204,8 @@ Fd_Snap_Top_Window_Edge snap_top_window_edge;
  */
 class Fd_Snap_Bottom_Window_Edge : public Fd_Snap_Bottom {
 public:
-  void check(Snap_Data &d) override { clr(); check_y_(d, d.bt, d.win->o->h()); }
-  void draw(Snap_Data &d) override { draw_bottom_brace(d.win->o); }
+  void check(Snap_Data &d) { clr(); check_y_(d, d.bt, d.win->o->h()); }
+  void draw(Snap_Data &d) { draw_bottom_brace(d.win->o); }
 };
 Fd_Snap_Bottom_Window_Edge snap_bottom_window_edge;
 
@@ -1214,11 +1214,11 @@ Fd_Snap_Bottom_Window_Edge snap_bottom_window_edge;
  */
 class Fd_Snap_Left_Window_Margin : public Fd_Snap_Left {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_window(d)) check_x_(d, d.bx, Fluid.proj.layout->left_window_margin);
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_h_arrow(d.bx, (d.by+d.bt)/2, 0);
   }
 };
@@ -1226,11 +1226,11 @@ Fd_Snap_Left_Window_Margin snap_left_window_margin;
 
 class Fd_Snap_Right_Window_Margin : public Fd_Snap_Right {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_window(d)) check_x_(d, d.br, d.win->o->w()-Fluid.proj.layout->right_window_margin);
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_h_arrow(d.br, (d.by+d.bt)/2, d.win->o->w()-1);
   }
 };
@@ -1238,11 +1238,11 @@ Fd_Snap_Right_Window_Margin snap_right_window_margin;
 
 class Fd_Snap_Top_Window_Margin : public Fd_Snap_Top {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_window(d)) check_y_(d, d.by, Fluid.proj.layout->top_window_margin);
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_v_arrow((d.bx+d.br)/2, d.by, 0);
   }
 };
@@ -1250,11 +1250,11 @@ Fd_Snap_Top_Window_Margin snap_top_window_margin;
 
 class Fd_Snap_Bottom_Window_Margin : public Fd_Snap_Bottom {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_window(d)) check_y_(d, d.bt, d.win->o->h()-Fluid.proj.layout->bottom_window_margin);
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_v_arrow((d.bx+d.br)/2, d.bt, d.win->o->h()-1);
   }
 };
@@ -1267,11 +1267,11 @@ Fd_Snap_Bottom_Window_Margin snap_bottom_window_margin;
  */
 class Fd_Snap_Left_Group_Edge : public Fd_Snap_Left {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_group(d)) check_x_(d, d.bx, parent(d)->x());
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_left_brace(parent(d));
   }
 };
@@ -1279,11 +1279,11 @@ Fd_Snap_Left_Group_Edge snap_left_group_edge;
 
 class Fd_Snap_Right_Group_Edge : public Fd_Snap_Right {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_group(d)) check_x_(d, d.br, parent(d)->x() + parent(d)->w());
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_right_brace(parent(d));
   }
 };
@@ -1291,11 +1291,11 @@ Fd_Snap_Right_Group_Edge snap_right_group_edge;
 
 class Fd_Snap_Top_Group_Edge : public Fd_Snap_Top {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_group(d)) check_y_(d, d.by, parent(d)->y());
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_top_brace(parent(d));
   }
 };
@@ -1303,11 +1303,11 @@ Fd_Snap_Top_Group_Edge snap_top_group_edge;
 
 class Fd_Snap_Bottom_Group_Edge : public Fd_Snap_Bottom {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_group(d)) check_y_(d, d.bt, parent(d)->y() + parent(d)->h());
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_bottom_brace(parent(d));
   }
 };
@@ -1319,11 +1319,11 @@ Fd_Snap_Bottom_Group_Edge snap_bottom_group_edge;
  */
 class Fd_Snap_Left_Group_Margin : public Fd_Snap_Left {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_group(d)) check_x_(d, d.bx, parent(d)->x() + Fluid.proj.layout->left_group_margin);
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_left_brace(parent(d));
     draw_h_arrow(d.bx, (d.by+d.bt)/2, parent(d)->x());
   }
@@ -1332,11 +1332,11 @@ Fd_Snap_Left_Group_Margin snap_left_group_margin;
 
 class Fd_Snap_Right_Group_Margin : public Fd_Snap_Right {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_group(d)) check_x_(d, d.br, parent(d)->x()+parent(d)->w()-Fluid.proj.layout->right_group_margin);
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_right_brace(parent(d));
     draw_h_arrow(d.br, (d.by+d.bt)/2, parent(d)->x()+parent(d)->w()-1);
   }
@@ -1345,11 +1345,11 @@ Fd_Snap_Right_Group_Margin snap_right_group_margin;
 
 class Fd_Snap_Top_Group_Margin : public Fd_Snap_Top {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_group(d) && !in_tabs(d)) check_y_(d, d.by, parent(d)->y()+Fluid.proj.layout->top_group_margin);
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_top_brace(parent(d));
     draw_v_arrow((d.bx+d.br)/2, d.by, parent(d)->y());
   }
@@ -1358,11 +1358,11 @@ Fd_Snap_Top_Group_Margin snap_top_group_margin;
 
 class Fd_Snap_Bottom_Group_Margin : public Fd_Snap_Bottom {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_group(d) && !in_tabs(d)) check_y_(d, d.bt, parent(d)->y()+parent(d)->h()-Fluid.proj.layout->bottom_group_margin);
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_bottom_brace(parent(d));
     draw_v_arrow((d.bx+d.br)/2, d.bt, parent(d)->y()+parent(d)->h()-1);
   }
@@ -1376,7 +1376,7 @@ Fd_Snap_Bottom_Group_Margin snap_bottom_group_margin;
  */
 class Fd_Snap_Top_Tabs_Margin : public Fd_Snap_Top_Group_Margin {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_tabs(d)) check_y_(d, d.by, parent(d)->y()+Fluid.proj.layout->top_tabs_margin);
   }
@@ -1385,7 +1385,7 @@ Fd_Snap_Top_Tabs_Margin snap_top_tabs_margin;
 
 class Fd_Snap_Bottom_Tabs_Margin : public Fd_Snap_Bottom_Group_Margin {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     if (in_tabs(d)) check_y_(d, d.bt, parent(d)->y()+parent(d)->h()-Fluid.proj.layout->bottom_tabs_margin);
   }
@@ -1415,7 +1415,7 @@ public:
     else
       check_x_y_(d, d.bx, nearest_x, d.by, nearest_y);
   }
-  bool matches(Snap_Data &d) override {
+  bool matches(Snap_Data &d) {
     if (d.drag == FD_LEFT) return (eex == ex);
     if (d.drag == FD_TOP) return (eey == ey) && (d.dx == dx);
     return (d.drag & mask) && (eex == ex) && (d.dx == dx) && (eey == ey) && (d.dy == dy);
@@ -1427,13 +1427,13 @@ public:
  */
 class Fd_Snap_Window_Grid : public Fd_Snap_Grid {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     Layout_Preset *layout = Fluid.proj.layout;
     clr();
     if (in_window(d)) check_grid(d, layout->left_window_margin, layout->window_grid_x, d.win->o->w()-layout->right_window_margin,
                                  layout->top_window_margin, layout->window_grid_y, d.win->o->h()-layout->bottom_window_margin);
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     Layout_Preset *layout = Fluid.proj.layout;
     draw_grid(nearest_x, nearest_y, layout->window_grid_x, layout->window_grid_y);
   }
@@ -1445,7 +1445,7 @@ Fd_Snap_Window_Grid snap_window_grid;
  */
 class Fd_Snap_Group_Grid : public Fd_Snap_Grid {
 public:
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     if (in_group(d)) {
       Layout_Preset *layout = Fluid.proj.layout;
       clr();
@@ -1454,7 +1454,7 @@ public:
                  g->y()+layout->top_group_margin, layout->group_grid_y, g->y()+g->h()-layout->bottom_group_margin);
     }
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     Layout_Preset *layout = Fluid.proj.layout;
     draw_grid(nearest_x, nearest_y, layout->group_grid_x, layout->group_grid_y);
   }
@@ -1472,7 +1472,7 @@ protected:
 public:
   Fd_Snap_Sibling() : best_match(0) { }
   virtual int sibling_check(Snap_Data &d, Fl_Widget *s) = 0;
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     clr();
     best_match = 0;
     if (!d.wgt) return;
@@ -1506,10 +1506,10 @@ public:
 class Fd_Snap_Siblings_Left_Same : public Fd_Snap_Sibling {
 public:
   Fd_Snap_Siblings_Left_Same() { type = 1; mask = FD_LEFT|FD_DRAG; }
-  int sibling_check(Snap_Data &d, Fl_Widget *s) override {
+  int sibling_check(Snap_Data &d, Fl_Widget *s) {
     return check_x_(d, d.bx, s->x());
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     if (best_match) draw_left_brace(best_match);
   }
 };
@@ -1521,11 +1521,11 @@ Fd_Snap_Siblings_Left_Same snap_siblings_left_same;
 class Fd_Snap_Siblings_Left : public Fd_Snap_Sibling {
 public:
   Fd_Snap_Siblings_Left() { type = 1; mask = FD_LEFT|FD_DRAG; }
-  int sibling_check(Snap_Data &d, Fl_Widget *s) override {
+  int sibling_check(Snap_Data &d, Fl_Widget *s) {
     return MIN(check_x_(d, d.bx, s->x()+s->w()),
                   check_x_(d, d.bx, s->x()+s->w()+Fluid.proj.layout->widget_gap_x) );
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     if (best_match) draw_right_brace(best_match);
   }
 };
@@ -1534,10 +1534,10 @@ Fd_Snap_Siblings_Left snap_siblings_left;
 class Fd_Snap_Siblings_Right_Same : public Fd_Snap_Sibling {
 public:
   Fd_Snap_Siblings_Right_Same() { type = 1; mask = FD_RIGHT|FD_DRAG; }
-  int sibling_check(Snap_Data &d, Fl_Widget *s) override {
+  int sibling_check(Snap_Data &d, Fl_Widget *s) {
     return check_x_(d, d.br, s->x()+s->w());
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     if (best_match) draw_right_brace(best_match);
   }
 };
@@ -1546,11 +1546,11 @@ Fd_Snap_Siblings_Right_Same snap_siblings_right_same;
 class Fd_Snap_Siblings_Right : public Fd_Snap_Sibling {
 public:
   Fd_Snap_Siblings_Right() { type = 1; mask = FD_RIGHT|FD_DRAG; }
-  int sibling_check(Snap_Data &d, Fl_Widget *s) override {
+  int sibling_check(Snap_Data &d, Fl_Widget *s) {
     return MIN(check_x_(d, d.br, s->x()),
                   check_x_(d, d.br, s->x()-Fluid.proj.layout->widget_gap_x));
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     if (best_match) draw_left_brace(best_match);
   }
 };
@@ -1559,10 +1559,10 @@ Fd_Snap_Siblings_Right snap_siblings_right;
 class Fd_Snap_Siblings_Top_Same : public Fd_Snap_Sibling {
 public:
   Fd_Snap_Siblings_Top_Same() { type = 2; mask = FD_TOP|FD_DRAG; }
-  int sibling_check(Snap_Data &d, Fl_Widget *s) override {
+  int sibling_check(Snap_Data &d, Fl_Widget *s) {
     return check_y_(d, d.by, s->y());
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     if (best_match) draw_top_brace(best_match);
   }
 };
@@ -1571,11 +1571,11 @@ Fd_Snap_Siblings_Top_Same snap_siblings_top_same;
 class Fd_Snap_Siblings_Top : public Fd_Snap_Sibling {
 public:
   Fd_Snap_Siblings_Top() { type = 2; mask = FD_TOP|FD_DRAG; }
-  int sibling_check(Snap_Data &d, Fl_Widget *s) override {
+  int sibling_check(Snap_Data &d, Fl_Widget *s) {
     return MIN(check_y_(d, d.by, s->y()+s->h()),
                   check_y_(d, d.by, s->y()+s->h()+Fluid.proj.layout->widget_gap_y));
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     if (best_match) draw_bottom_brace(best_match);
   }
 };
@@ -1584,10 +1584,10 @@ Fd_Snap_Siblings_Top snap_siblings_top;
 class Fd_Snap_Siblings_Bottom_Same : public Fd_Snap_Sibling {
 public:
   Fd_Snap_Siblings_Bottom_Same() { type = 2; mask = FD_BOTTOM|FD_DRAG; }
-  int sibling_check(Snap_Data &d, Fl_Widget *s) override {
+  int sibling_check(Snap_Data &d, Fl_Widget *s) {
     return check_y_(d, d.bt, s->y()+s->h());
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     if (best_match) draw_bottom_brace(best_match);
   }
 };
@@ -1596,11 +1596,11 @@ Fd_Snap_Siblings_Bottom_Same snap_siblings_bottom_same;
 class Fd_Snap_Siblings_Bottom : public Fd_Snap_Sibling {
 public:
   Fd_Snap_Siblings_Bottom() { type = 2; mask = FD_BOTTOM|FD_DRAG; }
-  int sibling_check(Snap_Data &d, Fl_Widget *s) override {
+  int sibling_check(Snap_Data &d, Fl_Widget *s) {
     return MIN(check_y_(d, d.bt, s->y()),
                   check_y_(d, d.bt, s->y()-Fluid.proj.layout->widget_gap_y));
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     if (best_match) draw_top_brace(best_match);
   }
 };
@@ -1615,7 +1615,7 @@ Fd_Snap_Siblings_Bottom snap_siblings_bottom;
 class Fd_Snap_Widget_Ideal_Width : public Snap_Action {
 public:
   Fd_Snap_Widget_Ideal_Width() { type = 1; mask = FD_LEFT|FD_RIGHT; }
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     Layout_Preset *layout = Fluid.proj.layout;
     clr();
     if (!d.wgt) return;
@@ -1633,7 +1633,7 @@ public:
       check_x_(d, d.bx, d.br-iw);
     }
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_width(d.bx, d.bt+7, d.br, 0);
   }
 };
@@ -1642,7 +1642,7 @@ Fd_Snap_Widget_Ideal_Width snap_widget_ideal_width;
 class Fd_Snap_Widget_Ideal_Height : public Snap_Action {
 public:
   Fd_Snap_Widget_Ideal_Height() { type = 2; mask = FD_TOP|FD_BOTTOM; }
-  void check(Snap_Data &d) override {
+  void check(Snap_Data &d) {
     Layout_Preset *layout = Fluid.proj.layout;
     clr();
     if (!d.wgt) return;
@@ -1660,7 +1660,7 @@ public:
       check_y_(d, d.by, d.bt-ih);
     }
   }
-  void draw(Snap_Data &d) override {
+  void draw(Snap_Data &d) {
     draw_height(d.br+7, d.by, d.bt, 0);
   }
 };