wip

1 files changed, 21 insertions, 21 deletions

diff --git a/fluid/nodes/Group_Node.cxx b/fluid/nodes/Group_Node.cxx
index 088e999aa..eb735cbeb 100644
--- a/fluid/nodes/Group_Node.cxx
+++ b/fluid/nodes/Group_Node.cxx
@@ -215,7 +215,7 @@ void Group_Node::write_code2(fld::io::Code_Writer& f) {
 // sure it is visible:
 void Group_Node::add_child(Node* cc, Node* before) {
   Widget_Node* c = (Widget_Node*)cc;
-  Fl_Widget* b = before ? ((Widget_Node*)before)->o : nullptr;
+  Fl_Widget* b = before ? ((Widget_Node*)before)->o : 0;
   ((Fl_Group*)o)->insert(*(c->o), b);
   o->redraw();
 }
@@ -233,7 +233,7 @@ void Group_Node::remove_child(Node* cc) {
 // move, don't change selected value:
 void Group_Node::move_child(Node* cc, Node* before) {
   Widget_Node* c = (Widget_Node*)cc;
-  Fl_Widget* b = before ? ((Widget_Node*)before)->o : nullptr;
+  Fl_Widget* b = before ? ((Widget_Node*)before)->o : 0;
   ((Fl_Group*)o)->insert(*(c->o), b);
   o->redraw();
 }
@@ -261,9 +261,9 @@ Pack_Node Pack_Node::prototype;      // the "factory"
 const char pack_type_name[] = "Fl_Pack";
 
 Fl_Menu_Item pack_type_menu[] = {
-  {"HORIZONTAL", 0, nullptr, (void*)Fl_Pack::HORIZONTAL},
-  {"VERTICAL", 0, nullptr, (void*)Fl_Pack::VERTICAL},
-  {nullptr}
+  {"HORIZONTAL", 0, 0, (void*)Fl_Pack::HORIZONTAL},
+  {"VERTICAL", 0, 0, (void*)Fl_Pack::VERTICAL},
+  {0}
 };
 
 Fl_Widget *Pack_Node::enter_live_mode(int) {
@@ -283,9 +283,9 @@ void Pack_Node::copy_properties()
 const char flex_type_name[] = "Fl_Flex";
 
 Fl_Menu_Item flex_type_menu[] = {
-  {"HORIZONTAL", 0, nullptr, (void*)Fl_Flex::HORIZONTAL},
-  {"VERTICAL", 0, nullptr, (void*)Fl_Flex::VERTICAL},
-  {nullptr}};
+  {"HORIZONTAL", 0, 0, (void*)Fl_Flex::HORIZONTAL},
+  {"VERTICAL", 0, 0, (void*)Fl_Flex::VERTICAL},
+  {0}};
 
 Flex_Node Flex_Node::prototype;      // the "factory"
 
@@ -420,7 +420,7 @@ void Flex_Node::postprocess_read()
     }
     fixedSizeTupleSize = 0;
     delete[] fixedSizeTuple;
-    fixedSizeTuple = nullptr;
+    fixedSizeTuple = 0;
   }
   suspend_auto_layout = 0;
 }
@@ -655,7 +655,7 @@ class Fl_Table_Proxy : public Fl_Table {
     }
   }
 public:
-  Fl_Table_Proxy(int x, int y, int w, int h, const char *l=nullptr)
+  Fl_Table_Proxy(int x, int y, int w, int h, const char *l=0)
   : Fl_Table(x, y, w, h, l) {
     end();
     for ( int r=0; r<MAX_ROWS; r++ )
@@ -681,7 +681,7 @@ Fl_Widget *Table_Node::widget(int X,int Y,int W,int H) {
 
 void Table_Node::add_child(Node* cc, Node* before) {
   Widget_Node* c = (Widget_Node*)cc;
-  Fl_Widget* b = before ? ((Widget_Node*)before)->o : nullptr;
+  Fl_Widget* b = before ? ((Widget_Node*)before)->o : 0;
   if (((Fl_Table*)o)->children()==1) { // the FLuid_Table has one extra child
     fl_message("Inserting child widgets into an Fl_Table is not recommended.\n"
                "Please refer to the documentation on Fl_Table.");
@@ -698,7 +698,7 @@ void Table_Node::remove_child(Node* cc) {
 
 void Table_Node::move_child(Node* cc, Node* before) {
   Widget_Node* c = (Widget_Node*)cc;
-  Fl_Widget* b = before ? ((Widget_Node*)before)->o : nullptr;
+  Fl_Widget* b = before ? ((Widget_Node*)before)->o : 0;
   ((Fl_Table*)o)->insert(*(c->o), b);
   o->redraw();
 }
@@ -750,7 +750,7 @@ void Fl_Tabs_Proxy::draw() {
 Node* Tabs_Node::click_test(int x, int y) {
   Fl_Tabs *t = (Fl_Tabs*)o;
   Fl_Widget *a = t->which(x,y);
-  if (!a) return nullptr; // didn't click on tab
+  if (!a) return 0; // didn't click on tab
   // changing the visible tab has an impact on the generated
   // source code, so mark this project as changed.
   int changed = (a!=t->value());
@@ -770,7 +770,7 @@ void Tabs_Node::remove_child(Node* cc) {
   if (cc->is_widget()) {
     Widget_Node* c = (Widget_Node*)cc;
     Fl_Tabs *t = (Fl_Tabs*)o;
-    if (t->value() == c->o) t->value(nullptr);
+    if (t->value() == c->o) t->value(0);
   }
   Group_Node::remove_child(cc);
 }
@@ -792,13 +792,13 @@ Scroll_Node Scroll_Node::prototype;  // the "factory"
 const char scroll_type_name[] = "Fl_Scroll";
 
 Fl_Menu_Item scroll_type_menu[] = {
-  {"BOTH", 0, nullptr, nullptr/*(void*)Fl_Scroll::BOTH*/},
-  {"HORIZONTAL", 0, nullptr, (void*)Fl_Scroll::HORIZONTAL},
-  {"VERTICAL", 0, nullptr, (void*)Fl_Scroll::VERTICAL},
-  {"HORIZONTAL_ALWAYS", 0, nullptr, (void*)Fl_Scroll::HORIZONTAL_ALWAYS},
-  {"VERTICAL_ALWAYS", 0, nullptr, (void*)Fl_Scroll::VERTICAL_ALWAYS},
-  {"BOTH_ALWAYS", 0, nullptr, (void*)Fl_Scroll::BOTH_ALWAYS},
-  {nullptr}};
+  {"BOTH", 0, 0, 0/*(void*)Fl_Scroll::BOTH*/},
+  {"HORIZONTAL", 0, 0, (void*)Fl_Scroll::HORIZONTAL},
+  {"VERTICAL", 0, 0, (void*)Fl_Scroll::VERTICAL},
+  {"HORIZONTAL_ALWAYS", 0, 0, (void*)Fl_Scroll::HORIZONTAL_ALWAYS},
+  {"VERTICAL_ALWAYS", 0, 0, (void*)Fl_Scroll::VERTICAL_ALWAYS},
+  {"BOTH_ALWAYS", 0, 0, (void*)Fl_Scroll::BOTH_ALWAYS},
+  {0}};
 
 Fl_Widget *Scroll_Node::enter_live_mode(int) {
   Fl_Group *grp = new Fl_Scroll(o->x(), o->y(), o->w(), o->h());