From c8adc2fdded2081cb8dd8ba4b72b2703fc74889b Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sun, 27 Sep 2009 11:06:56 +0000 Subject: Fixed a few minor issues with Xcode builds. Fixed all color related call to Fl_Color type (STR #2208). Changed Fl_Color back to typedef unsigned. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6902 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/forms.H | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'FL/forms.H') diff --git a/FL/forms.H b/FL/forms.H index 62ef6461b..a168049fb 100644 --- a/FL/forms.H +++ b/FL/forms.H @@ -212,11 +212,11 @@ inline void fl_set_object_lsize(Fl_Widget* o,int s) {o->labelsize(s);} /* forms lib font indexes must be byte sized - extract correct byte from style word */ inline void fl_set_object_lstyle(Fl_Widget* o,int a) { o->labelfont((Fl_Font)(a&0xff)); o->labeltype((Fl_Labeltype)(a>>8));} -inline void fl_set_object_lcol(Fl_Widget* o, unsigned a) {o->labelcolor(a);} +inline void fl_set_object_lcol(Fl_Widget* o, Fl_Color a) {o->labelcolor(a);} #define fl_set_object_lcolor fl_set_object_lcol inline void fl_set_object_lalign(Fl_Widget* o, Fl_Align a) {o->align(a);} #define fl_set_object_align fl_set_object_lalign -inline void fl_set_object_color(Fl_Widget* o,unsigned a,unsigned b) {o->color(a,b);} +inline void fl_set_object_color(Fl_Widget* o,Fl_Color a,Fl_Color b) {o->color(a,b);} inline void fl_set_object_label(Fl_Widget* o, const char* a) {o->label(a); o->redraw();} inline void fl_set_object_position(Fl_Widget*o,int x,int y) {o->position(x,y);} inline void fl_set_object_size(Fl_Widget* o, int w, int h) {o->size(w,h);} @@ -532,7 +532,7 @@ inline void fl_set_chart_lstyle(Fl_Widget* o, Fl_Font v) { ((Fl_Chart*)o)->textfont(v);} inline void fl_set_chart_lsize(Fl_Widget* o, int v) { ((Fl_Chart*)o)->textsize(v);} -inline void fl_set_chart_lcolor(Fl_Widget* o, unsigned v) { +inline void fl_set_chart_lcolor(Fl_Widget* o, Fl_Color v) { ((Fl_Chart*)o)->textcolor(v);} #define fl_set_chart_lcol fl_set_chart_lcolor @@ -688,7 +688,7 @@ inline void fl_set_input(Fl_Widget* o, const char* v) { ((Fl_Input*)o)->value(v);} inline void fl_set_input_return(Fl_Widget* o, int x) { ((Fl_Input*)o)->when((Fl_When)(x | FL_WHEN_RELEASE));} -inline void fl_set_input_color(Fl_Widget* o, unsigned a, unsigned b) { +inline void fl_set_input_color(Fl_Widget* o, Fl_Color a, Fl_Color b) { ((Fl_Input*)o)->textcolor(a); ((Fl_Input*)o)->cursor_color(b); } -- cgit v1.2.3