summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2008-10-13 20:11:30 +0000
committerMatthias Melcher <fltk@matthiasm.com>2008-10-13 20:11:30 +0000
commit8a20846803ea1d442c0eedc649cc6d4073bfa463 (patch)
tree43b3820c714bc37f0adae2f05eb91b5d7ff9d72f
parent395129dfdbea73c32b8c7f36397d2f9cec4b5388 (diff)
STR 1992: Fixed Fluid textcolor output
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6420 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES1
-rw-r--r--fluid/Fl_Widget_Type.cxx2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index edf9d6d7b..b5c635786 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
CHANGES IN FLTK 1.3.0
+ - Fixed Fluid textcolor output (STR #1992)
- Fixed wrong default value of Fl_Spinner in
Fluid (STR #1991)
- Fixed first modifier key event (STR #1952)
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index b3f72a408..8b9b84a22 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -2245,7 +2245,7 @@ void Fl_Widget_Type::write_widget_code() {
Fl_Font f; int s; Fl_Color c; textstuff(0,f,s,c);
if (f != ff) write_c("%s%s->textfont(%d);\n", indent(), var, f);
if (s != fs) write_c("%s%s->textsize(%d);\n", indent(), var, s);
- if (c != fc) write_c("%s%s->textcolor(%d);\n",indent(), var, c);
+ if (c != fc) write_color("textcolor", c);
}}
const char* ud = user_data();
if (class_name(1) && !parent->is_widget()) ud = "this";