diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2009-09-27 11:06:56 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2009-09-27 11:06:56 +0000 |
| commit | c8adc2fdded2081cb8dd8ba4b72b2703fc74889b (patch) | |
| tree | bb59bec7b0ab67547e857e2a47bb6753684a9e96 /src | |
| parent | e91ec4b3b300c9c1b1e5b54aded1cab5c7e1a571 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Tooltip.cxx | 4 | ||||
| -rw-r--r-- | src/fl_boxtype.cxx | 2 | ||||
| -rw-r--r-- | src/glut_font.cxx | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/Fl_Tooltip.cxx b/src/Fl_Tooltip.cxx index 0ca2178de..1ba661a0f 100644 --- a/src/Fl_Tooltip.cxx +++ b/src/Fl_Tooltip.cxx @@ -34,10 +34,10 @@ float Fl_Tooltip::delay_ = 1.0f; float Fl_Tooltip::hoverdelay_ = 0.2f; int Fl_Tooltip::enabled_ = 1; -unsigned Fl_Tooltip::color_ = fl_color_cube(FL_NUM_RED - 1, +Fl_Color Fl_Tooltip::color_ = fl_color_cube(FL_NUM_RED - 1, FL_NUM_GREEN - 1, FL_NUM_BLUE - 2); -unsigned Fl_Tooltip::textcolor_ = FL_BLACK; +Fl_Color Fl_Tooltip::textcolor_ = FL_BLACK; Fl_Font Fl_Tooltip::font_ = FL_HELVETICA; Fl_Fontsize Fl_Tooltip::size_ = FL_NORMAL_SIZE; diff --git a/src/fl_boxtype.cxx b/src/fl_boxtype.cxx index 7162b1232..f4ae05941 100644 --- a/src/fl_boxtype.cxx +++ b/src/fl_boxtype.cxx @@ -406,7 +406,7 @@ void Fl_Widget::draw_box() const { // if (t == FL_FLAT_BOX) return; // t += 2; // convert box to frame // } - draw_box((Fl_Boxtype)t, x_, y_, w_, h_, (Fl_Color)color_); + draw_box((Fl_Boxtype)t, x_, y_, w_, h_, color_); } /** Draws a box of type t, of color c at the widget's position and size. */ void Fl_Widget::draw_box(Fl_Boxtype t, Fl_Color c) const { diff --git a/src/glut_font.cxx b/src/glut_font.cxx index 474689f33..ce25d06b3 100644 --- a/src/glut_font.cxx +++ b/src/glut_font.cxx @@ -115,8 +115,7 @@ void glutStrokeString(void* fontID, const unsigned char *string) { * point back to the start of the line and down one line. */ -#if defined(__GNUC__) -#warning FIXME This needs to be UTF aware now +#if defined(__GNUC__)#warning FIXME This needs to be UTF aware now #endif /*__GNUC__*/ while ((c = *string++) != 0) { |