summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>1999-01-13 15:53:57 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>1999-01-13 15:53:57 +0000
commitde114a82578606460515c9a0cfc6a6f81549856a (patch)
tree96c010a89a4ea4ad60263f04addafbd7b740ef75
parente41c045fe52be2c262e8add367e1a703789ac73e (diff)
The text color button in Fluid didn't pop up with the correct color
preselected. git-svn-id: file:///fltk/svn/fltk/trunk@212 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--fluid/Fl_Widget_Type.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index 271284b12..bda1ab10b 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Widget_Type.cxx,v 1.13 1999/01/07 19:17:11 mike Exp $"
+// "$Id: Fl_Widget_Type.cxx,v 1.14 1999/01/13 15:53:57 mike Exp $"
//
// Widget type code for the Fast Light Tool Kit (FLTK).
//
@@ -881,7 +881,7 @@ void textcolor_cb(Fl_Button* i, void* v) {
if (!current_widget->textstuff(0,n,s,c)) {i->hide(); return;}
i->show();
} else {
- c = i->labelcolor();
+ c = i->color();
Fl_Color d = fl_show_colormap(c);
if (d == c) return;
c = d;
@@ -1701,5 +1701,5 @@ int Fl_Widget_Type::read_fdesign(const char* name, const char* value) {
}
//
-// End of "$Id: Fl_Widget_Type.cxx,v 1.13 1999/01/07 19:17:11 mike Exp $".
+// End of "$Id: Fl_Widget_Type.cxx,v 1.14 1999/01/13 15:53:57 mike Exp $".
//