Author: matt
Date: 2008-12-02 09:21:36 -0800 (Tue, 02 Dec 2008)
New Revision: 6537
Log:
Fixed RGB Color issues for round box type
Modified:
branches/branch-1.1/CHANGES
branches/branch-1.1/src/fl_round_box.cxx
Modified: branches/branch-1.1/CHANGES
===================================================================
--- branches/branch-1.1/CHANGES 2008-12-02 13:19:13 UTC (rev 6536)
+++ branches/branch-1.1/CHANGES 2008-12-02 17:21:36 UTC (rev 6537)
@@ -1,5 +1,6 @@
CHANGES IN FLTK 1.1.10
+ - Fixed RGB colors for round box (STR #2097)
- Fixed documentation (added missing COMCTRL32.LIB
dependency)
- Fl_Group::clip_children() is now public (STR #2017)
Modified: branches/branch-1.1/src/fl_round_box.cxx
===================================================================
--- branches/branch-1.1/src/fl_round_box.cxx 2008-12-02 13:19:13 UTC (rev
6536)
+++ branches/branch-1.1/src/fl_round_box.cxx 2008-12-02 17:21:36 UTC (rev
6537)
@@ -41,7 +41,7 @@
enum {UPPER_LEFT, LOWER_RIGHT, CLOSED, FILL};
-static void draw(int which, int x,int y,int w,int h, int inset, uchar color)
+static void draw(int which, int x,int y,int w,int h, int inset, unsigned int
color)
{
if (inset*2 >= w) inset = (w-1)/2;
if (inset*2 >= h) inset = (h-1)/2;
@@ -51,7 +51,7 @@
h -= 2*inset;
int d = w <= h ? w : h;
if (d <= 1) return;
- fl_color((Fl_Color)color);
+ fl_color(color);
void (*f)(int,int,int,int,double,double);
f = (which==FILL) ? fl_pie : fl_arc_i;
if (which >= CLOSED) {
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
