diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-10-30 17:42:21 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-10-30 17:42:21 +0000 |
| commit | 067d1d8a61a53723f286e12059ccc168ea8e98c9 (patch) | |
| tree | 889a12e1576b5f30ca89751aba3c1b6a59a6ba01 /fluid | |
| parent | 4baeeefabe36b385f9a44c933974617d9ae2a37c (diff) | |
Updated the default label and text colors of all widgets to use
FL_FOREGROUND_COLOR instead of FL_BLACK (STR #1052)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4609 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/CodeEditor.cxx | 14 | ||||
| -rw-r--r-- | fluid/Fl_Menu_Type.cxx | 2 | ||||
| -rw-r--r-- | fluid/Fl_Type.cxx | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/fluid/CodeEditor.cxx b/fluid/CodeEditor.cxx index ed3ad3f8b..a6590ce62 100644 --- a/fluid/CodeEditor.cxx +++ b/fluid/CodeEditor.cxx @@ -38,13 +38,13 @@ Fl_Text_Display::Style_Table_Entry CodeEditor:: styletable[] = { // Style table - { FL_BLACK, FL_COURIER, 11 }, // A - Plain - { FL_DARK_GREEN, FL_COURIER_ITALIC, 11 }, // B - Line comments - { FL_DARK_GREEN, FL_COURIER_ITALIC, 11 }, // C - Block comments - { FL_BLUE, FL_COURIER, 11 }, // D - Strings - { FL_DARK_RED, FL_COURIER, 11 }, // E - Directives - { FL_DARK_RED, FL_COURIER_BOLD, 11 }, // F - Types - { FL_BLUE, FL_COURIER_BOLD, 11 } // G - Keywords + { FL_FOREGROUND_COLOR, FL_COURIER, 11 }, // A - Plain + { FL_DARK_GREEN, FL_COURIER_ITALIC, 11 }, // B - Line comments + { FL_DARK_GREEN, FL_COURIER_ITALIC, 11 }, // C - Block comments + { FL_BLUE, FL_COURIER, 11 }, // D - Strings + { FL_DARK_RED, FL_COURIER, 11 }, // E - Directives + { FL_DARK_RED, FL_COURIER_BOLD, 11 }, // F - Types + { FL_BLUE, FL_COURIER_BOLD, 11 } // G - Keywords }; const char * const CodeEditor:: code_keywords[] = { // Sorted list of C/C++ keywords... diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx index 9beaa62b2..a99187093 100644 --- a/fluid/Fl_Menu_Type.cxx +++ b/fluid/Fl_Menu_Type.cxx @@ -524,7 +524,7 @@ Fl_Menu_Bar_Type Fl_Menu_Bar_type; void Shortcut_Button::draw() { if (value()) draw_box(FL_DOWN_BOX, (Fl_Color)9); else draw_box(FL_UP_BOX, FL_WHITE); - fl_font(FL_HELVETICA,14); fl_color(FL_BLACK); + fl_font(FL_HELVETICA,14); fl_color(FL_FOREGROUND_COLOR); fl_draw(fl_shortcut_label(svalue),x()+6,y(),w(),h(),FL_ALIGN_LEFT); } diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx index 01d5da7d5..222444cd5 100644 --- a/fluid/Fl_Type.cxx +++ b/fluid/Fl_Type.cxx @@ -248,8 +248,8 @@ extern const char* subclassname(Fl_Type*); void Widget_Browser::item_draw(void *v, int X, int Y, int, int) const { Fl_Type *l = (Fl_Type *)v; X += 3 + 18 + l->level * 12; - if (l->new_selected) fl_color(fl_contrast(FL_BLACK,FL_SELECTION_COLOR)); - else fl_color(FL_BLACK); + if (l->new_selected) fl_color(fl_contrast(FL_FOREGROUND_COLOR,FL_SELECTION_COLOR)); + else fl_color(FL_FOREGROUND_COLOR); Fl_Pixmap *pm = pixmap[l->pixmapID()]; if (pm) pm->draw(X-18, Y); if (l->is_public() == 0) lock_pixmap.draw(X - 17, Y); |