Author: matt
Date: 2009-06-28 15:09:25 -0700 (Sun, 28 Jun 2009)
New Revision: 6801
Log:
Added cast to Fl_Color in all Fluid code (STR #2206)
Modified:
branches/branch-1.1/CHANGES
branches/branch-1.1/fluid/Fl_Widget_Type.cxx
Modified: branches/branch-1.1/CHANGES
===================================================================
--- branches/branch-1.1/CHANGES 2009-06-28 21:54:59 UTC (rev 6800)
+++ branches/branch-1.1/CHANGES 2009-06-28 22:09:25 UTC (rev 6801)
@@ -1,5 +1,6 @@
CHANGES IN FLTK 1.1.10
+ - Added cast to Fl_Color in all Fluid code (STR #2206)
- Fixed wrong identifier for special keys combined with
modifier (STR #2196)
- Fixed documentation for Fl_Progress (STR #2209)
Modified: branches/branch-1.1/fluid/Fl_Widget_Type.cxx
===================================================================
--- branches/branch-1.1/fluid/Fl_Widget_Type.cxx 2009-06-28 21:54:59 UTC
(rev 6800)
+++ branches/branch-1.1/fluid/Fl_Widget_Type.cxx 2009-06-28 22:09:25 UTC
(rev 6801)
@@ -2124,7 +2124,8 @@
}
const char *var = is_class() ? "this" : name() ? name() : "o";
if (color_name) {
- write_c("%s%s->%s(%s);\n", indent(), var, field, color_name);
+ write_c("%s%s->%s((Fl_Color)%s);\n", indent(), var, field, color_name);
+ // we still must cast ^^^^^ here because a few widgets have the wrong
argument type. Ouch!
} else {
write_c("%s%s->%s((Fl_Color)%d);\n", indent(), var, field, color);
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
