Author: ianmacarthur
Date: 2010-04-05 03:20:52 -0700 (Mon, 05 Apr 2010)
New Revision: 7427
Log:
forms lib support now compiles on win32 again.
Modified:
branches/branch-3.0/fltk3/forms.H
Modified: branches/branch-3.0/fltk3/forms.H
===================================================================
--- branches/branch-3.0/fltk3/forms.H 2010-04-05 10:00:41 UTC (rev 7426)
+++ branches/branch-3.0/fltk3/forms.H 2010-04-05 10:20:52 UTC (rev 7427)
@@ -88,11 +88,11 @@
#define FL_TOMATO ((fltk3::Color)(131))
#define FL_INDIANRED ((fltk3::Color)(164))
#define FL_SLATEBLUE ((fltk3::Color)(195))
-#define fltk3::DARKGOLD ((fltk3::Color)(84))
+#define FL_DARKGOLD ((fltk3::Color)(84))
#define FL_PALEGREEN ((fltk3::Color)(157))
#define FL_ORCHID ((fltk3::Color)(203))
-#define fltk3::DARKCYAN ((fltk3::Color)(189))
-#define fltk3::DARKTOMATO ((fltk3::Color)(113))
+#define FL_DARKCYAN ((fltk3::Color)(189))
+#define FL_DARKTOMATO ((fltk3::Color)(113))
#define FL_WHEAT ((fltk3::Color)(174))
#define FL_ALIGN_BESIDE fltk3::ALIGN_INSIDE
@@ -159,7 +159,7 @@
#define FL_BOUND_WIDTH 3
typedef int FL_Coord;
-typedef int fltk3::COLOR;
+typedef int FL_COLOR;
////////////////////////////////////////////////////////////////
// fltk interaction:
@@ -216,7 +216,7 @@
#define fl_set_object_lcolor fl_set_object_lcol
inline void fl_set_object_lalign(fltk3::Widget* o, fltk3::Align a)
{o->align(a);}
#define fl_set_object_align fl_set_object_lalign
-inline void fl_set_object_color(fltk3::Widget* o,fltk3::Color a,fltk3::Color
b) {o->color(a,b);}
+inline void fl_set_object_color(fltk3::Widget* o, fltk3::Color a, fltk3::Color
b) {o->color(a,b);}
inline void fl_set_object_label(fltk3::Widget* o, const char* a) {o->label(a);
o->redraw();}
inline void fl_set_object_position(fltk3::Widget*o,int x,int y)
{o->position(x,y);}
inline void fl_set_object_size(fltk3::Widget* o, int w, int h) {o->size(w,h);}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
