summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Fl_Message.cxx7
-rw-r--r--src/Fl_String_class.cxx2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/Fl_Message.cxx b/src/Fl_Message.cxx
index 0aa7ed587..4cfb824a2 100644
--- a/src/Fl_Message.cxx
+++ b/src/Fl_Message.cxx
@@ -46,7 +46,8 @@
#include <FL/Fl.H>
#include "flstring.h"
#include <FL/fl_ask.H>
-#include "Fl_Message.h" // intentionally "hidden" in src/...
+#include "Fl_Message.h" // intentionally "hidden" in src/...
+#include "FL/fl_string.h" // fl_strdup()
#include <FL/Fl_Window.H>
#include <FL/Fl_Box.H>
@@ -510,7 +511,7 @@ void Fl_Message::message_title(const char *title) {
message_title_ = 0;
}
if (title)
- message_title_ = strdup(title);
+ message_title_ = fl_strdup(title);
}
/** Sets the default title of the dialog window used in many common dialogs.
@@ -534,7 +535,7 @@ void Fl_Message::message_title_default(const char *title) {
message_title_default_ = 0;
}
if (title)
- message_title_default_ = strdup(title);
+ message_title_default_ = fl_strdup(title);
}
void Fl_Message::icon_label(const char *str) {
diff --git a/src/Fl_String_class.cxx b/src/Fl_String_class.cxx
index f0aa4f405..79b63f1fa 100644
--- a/src/Fl_String_class.cxx
+++ b/src/Fl_String_class.cxx
@@ -99,7 +99,7 @@ void Fl_String::alloc_buf(int size) {
}
void Fl_String::value(const char *str) {
- value(str, str ? strlen(str) : 0);
+ value(str, str ? (int)strlen(str) : 0);
}
int Fl_String::slen() const {