wip

1 files changed, 17 insertions, 17 deletions

diff --git a/fluid/panels/widget_panel.cxx b/fluid/panels/widget_panel.cxx
index 195ddc533..897cec6cc 100644
--- a/fluid/panels/widget_panel.cxx
+++ b/fluid/panels/widget_panel.cxx
@@ -572,7 +572,7 @@ void run_image_panel() {
   Fl_Shared_Image *img = (Fl_Shared_Image*)image_panel_data->user_data();
   if (img) {
     img->release();
-    image_panel_data->user_data(nullptr);
+    image_panel_data->user_data(0);
   }
 //fl ▲ ----------~~--~==~=-=-----------~-=~~==~=-=-=~--=~--=~ ▲ fl//
 }
@@ -629,7 +629,7 @@ static void cb_widget_image_input(Fl_Input* o, void* v) {
   if (v == LOAD) {
     if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->activate();
-      o->value(((Widget_Node*)current_widget)->image_name().c_str());
+      o->value(((Widget_Node*)current_widget)->image_name());
     } else o->deactivate();
   } else {
     int mod = 0;
@@ -679,7 +679,7 @@ static void cb_widget_deimage_input(Fl_Input* o, void* v) {
   if (v == LOAD) {
     if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->activate();
-      o->value(((Widget_Node*)current_widget)->inactive_name().c_str());
+      o->value(((Widget_Node*)current_widget)->inactive_name());
     } else o->deactivate();
   } else {
     int mod = 0;
@@ -1195,7 +1195,7 @@ static void cb_Left(Fl_Value_Input* o, void* v) {
     [](Fl_Flex *w, Fl_Value_Input* i) -> void
     {
       int v;
-      w->margin(&v, nullptr, nullptr, nullptr);
+      w->margin(&v, 0, 0, 0);
       i->value((double)v);
     },
     [](Fl_Flex *w, int new_value) -> int
@@ -1219,7 +1219,7 @@ static void cb_Top(Fl_Value_Input* o, void* v) {
     [](Fl_Flex *w, Fl_Value_Input* i) -> void
     {
       int v;
-      w->margin(nullptr, &v, nullptr, nullptr);
+      w->margin(0, &v, 0, 0);
       i->value((double)v);
     },
     [](Fl_Flex *w, int new_value)
@@ -1243,7 +1243,7 @@ static void cb_Right(Fl_Value_Input* o, void* v) {
     [](Fl_Flex *w, Fl_Value_Input* i) -> void
     {
       int v;
-      w->margin(nullptr, nullptr, &v, nullptr);
+      w->margin(0, 0, &v, 0);
       i->value((double)v);
     },
     [](Fl_Flex *w, int new_value) -> int
@@ -1267,7 +1267,7 @@ static void cb_Bottom(Fl_Value_Input* o, void* v) {
     [](Fl_Flex *w, Fl_Value_Input* i) -> void
     {
       int v;
-      w->margin(nullptr, nullptr, nullptr, &v);
+      w->margin(0, 0, 0, &v);
       i->value((double)v);
     },
     [](Fl_Flex *w, int new_value) -> int
@@ -1702,7 +1702,7 @@ static void cb_wp_gui_tooltip(Fl_Input* o, void* v) {
   if (v == LOAD) {
     if (current_widget->is_widget()) {
       o->activate();
-      o->value(((Widget_Node*)current_widget)->tooltip().c_str());
+      o->value(((Widget_Node*)current_widget)->tooltip());
     } else {
       o->deactivate();
     }
@@ -2172,7 +2172,7 @@ static void cb_e(Fl_Input* o, void* v) {
         o->deactivate();
       } else {
         o->activate();
-        o->value(current_widget->subclass().c_str());
+        o->value(current_widget->subclass());
       }
     } else {
       int mod = 0;
@@ -2189,8 +2189,8 @@ static void cb_e(Fl_Input* o, void* v) {
 static void cb_f(Fl_Choice* o, void* v) {
 //fl ▼ ---------------------- callback ~~---=--=-=~=-=-~-~~~~ ▼ fl//
   static Fl_Menu_Item empty_type_menu[] = {
-      {"Normal",0,nullptr,(void*)nullptr},
-      {nullptr}};
+      {"Normal",0,0,(void*)0},
+      {0}};
 
     if (v == LOAD) {
       Fl_Menu_Item* m = current_widget->subtypes();
@@ -2303,7 +2303,7 @@ static void cb_v_input(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~-==~=~-~~==-=--~~--= ▼ fl//
   int n = fl_int(o->user_data());
     if (v == LOAD) {
-      o->value(current_widget->extra_code(n).c_str());
+      o->value(current_widget->extra_code(n));
     } else {
       int mod = 0;
       const char *c = o->value();
@@ -2453,7 +2453,7 @@ static void cb_14(Fl_Input_Choice* o, void* v) {
     const char *c = o->value();
     const char *d = c_check(c);
     if (!*c) o->value(dflt);
-    else if (!strcmp(c,dflt)) c = nullptr;
+    else if (!strcmp(c,dflt)) c = 0;
     if (!d) {
       if (c && *c && c[strlen(c)-1] != '*' && strcmp(c,"long"))
         d = "must be pointer or long";
@@ -2631,7 +2631,7 @@ static void cb_fileopen(Fl_Button*, void* v) {
   if (v != LOAD) {
     Fluid.proj.enter_project_dir();
     const char *fn = fl_file_chooser("Load Inline Data",
-      nullptr, wp_data_filename->value(), 1);
+      0, wp_data_filename->value(), 1);
     Fluid.proj.leave_project_dir();
     if (fn) {
       if (strcmp(fn, wp_data_filename->value())) {
@@ -2754,7 +2754,7 @@ static void cb_comment_predefined_2(Fl_Menu_Button* o, void* v) {
         fl_message("Please select an entry from this menu first.");
       } else if (fl_choice("Are you sure that you want to delete the entry\n"
                            "\"%s\"\nfrom the database?", "Cancel", "Delete",
-                           nullptr, itempath)) {
+                           0, itempath)) {
         Fl_Preferences db(Fl_Preferences::USER_L, "fltk.org", "fluid_comments");
         db.deleteEntry(itempath);
         o->remove(last_selected_item);
@@ -2793,8 +2793,8 @@ static void cb_comment_load_2(Fl_Button*, void* v) {
   // load a comment from disk
   if (v != LOAD) {
     fl_file_chooser_ok_label("Load");
-    const char *fname = fl_file_chooser("Pick a comment", nullptr, nullptr);
-    fl_file_chooser_ok_label(nullptr);
+    const char *fname = fl_file_chooser("Pick a comment", 0, 0);
+    fl_file_chooser_ok_label(0);
     if (fname) {
       if (comment_tabs_name->buffer()->loadfile(fname)) {
         fl_alert("Error loading file\n%s", fname);