diff options
| author | erco77 <erco@seriss.com> | 2020-08-01 14:35:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-01 14:35:44 -0700 |
| commit | 7abc09ad89b4c3d0c17ee8dc9d02ccd261cd13f2 (patch) | |
| tree | 72e461bac5930f8a319d48a6ea99ba793dd35a8b /src/Fl_Menu_add.cxx | |
| parent | 7514a73ba759f7fc9965eeef3b92ece899bd7a69 (diff) | |
| parent | e9688822ec68f066f425953278a853e049b93dfb (diff) | |
Merge pull request #116 from erco77/fl_strdup
fl_strdup() implemented + deployed
Diffstat (limited to 'src/Fl_Menu_add.cxx')
| -rw-r--r-- | src/Fl_Menu_add.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Fl_Menu_add.cxx b/src/Fl_Menu_add.cxx index b2282b6f2..d5fdae9c5 100644 --- a/src/Fl_Menu_add.cxx +++ b/src/Fl_Menu_add.cxx @@ -25,6 +25,7 @@ // string with a % sign in it! #include <FL/Fl_Menu_.H> +#include <FL/fl_string.h> #include "flstring.h" #include <stdio.h> #include <stdlib.h> @@ -62,7 +63,7 @@ static Fl_Menu_Item* array_insert( memmove(array+n+1, array+n, sizeof(Fl_Menu_Item)*(size-n)); // create the new item: Fl_Menu_Item* m = array+n; - m->text = text ? strdup(text) : 0; + m->text = text ? fl_strdup(text) : 0; m->shortcut_ = 0; m->callback_ = 0; m->user_data_ = 0; @@ -455,7 +456,7 @@ void Fl_Menu_::replace(int i, const char *str) { if (!alloc) copy(menu_); if (alloc > 1) { free((void *)menu_[i].text); - str = strdup(str?str:""); + str = fl_strdup(str?str:""); } menu_[i].text = str; } |