]>
Commit | Line | Data |
---|---|---|
c119b8a3 JB |
1 | --- fltk-1.1.3/fluid/Fl_Widget_Type.cxx.orig Tue Nov 5 07:45:40 2002 |
2 | +++ fltk-1.1.3/fluid/Fl_Widget_Type.cxx Thu Oct 30 17:15:34 2003 | |
3 | @@ -1570,9 +1570,9 @@ | |
4 | boxname(b->down_box())); | |
5 | } | |
6 | if (o->color() != tplate->color() || subclass()) | |
7 | - write_c("%so->color(%d);\n", indent(), o->color()); | |
8 | + write_c("%so->color((Fl_Color)%d);\n", indent(), o->color()); | |
9 | if (o->selection_color() != tplate->selection_color() || subclass()) | |
10 | - write_c("%so->selection_color(%d);\n", indent(), o->selection_color()); | |
11 | + write_c("%so->selection_color((Fl_Color)%d);\n", indent(), o->selection_color()); | |
12 | if (image) image->write_code(); | |
13 | if (inactive) inactive->write_code(1); | |
14 | if (o->labeltype() != tplate->labeltype() || subclass()) | |
15 | @@ -1583,7 +1583,7 @@ | |
16 | if (o->labelsize() != tplate->labelsize() || subclass()) | |
17 | write_c("%so->labelsize(%d);\n", indent(), o->labelsize()); | |
18 | if (o->labelcolor() != tplate->labelcolor() || subclass()) | |
19 | - write_c("%so->labelcolor(%d);\n", indent(), o->labelcolor()); | |
20 | + write_c("%so->labelcolor((Fl_Color)%d);\n", indent(), o->labelcolor()); | |
21 | if (is_valuator()) { | |
22 | Fl_Valuator* v = (Fl_Valuator*)o; | |
23 | Fl_Valuator* f = (Fl_Valuator*)(tplate); | |
24 | @@ -1605,7 +1605,7 @@ | |
25 | Fl_Font f; int s; Fl_Color c; textstuff(0,f,s,c); | |
26 | if (f != ff) write_c("%so->textfont(%d);\n", indent(), f); | |
27 | if (s != fs) write_c("%so->textsize(%d);\n", indent(), s); | |
28 | - if (c != fc) write_c("%so->textcolor(%d);\n",indent(), c); | |
29 | + if (c != fc) write_c("%so->textcolor((Fl_Color)%d);\n",indent(), c); | |
30 | }} | |
31 | const char* ud = user_data(); | |
32 | if (class_name(1) && !parent->is_widget()) ud = "this"; |