Change lock icon color to red.

Fix Widget_Browser::handle() method - wasn't offseting the mouse position
for the lock icon.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2114 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 21 insertions, 19 deletions

diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx
index 8df2f0a3f..0efebee2d 100644
--- a/fluid/Fl_Type.cxx
+++ b/fluid/Fl_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Type.cxx,v 1.6.2.6.2.4 2002/04/26 11:51:52 easysw Exp $"
+// "$Id: Fl_Type.cxx,v 1.6.2.6.2.5 2002/04/27 18:08:45 easysw Exp $"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -254,7 +254,7 @@ int Widget_Browser::handle(int e) {
     if (!Fl::event_inside(X,Y,W,H)) break;
     l = (Fl_Type*)find_item(Fl::event_y());
     if (l) {
-      X += 10*l->level;
+      X += 10*l->level + 16;
       if (l->is_parent() && Fl::event_x()>X && Fl::event_x()<X+13) {
 	title = pushedtitle = l;
 	redraw_line(l);
@@ -677,5 +677,5 @@ void Fl_Type::read_property(const char *c) {
 int Fl_Type::read_fdesign(const char*, const char*) {return 0;}
 
 //
-// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.4 2002/04/26 11:51:52 easysw Exp $".
+// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.5 2002/04/27 18:08:45 easysw Exp $".
 //
diff --git a/fluid/lock.xpm b/fluid/lock.xpm
index 465495351..002f55527 100644
--- a/fluid/lock.xpm
+++ b/fluid/lock.xpm
@@ -4,11 +4,11 @@ static char *lock_xpm[] = {
 "16 16 6 1",
 /* colors */
 "` c #000000",
-"a c #00FFFF",
-"b c #80FFFF",
+"a c #FF0000",
+"b c #FF4040",
 "c c none",
-"d c #FFFFFF",
-"e c #0000FF",
+"d c #FF8080",
+"e c #800000",
 /* pixels */
 "cccccccccccccccc",
 "cccccccccccccccc",
diff --git a/fluid/makedepend b/fluid/makedepend
index aa652044e..1969a0c19 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -57,6 +57,7 @@ Fl_Type.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/x.H
 Fl_Type.o: ../FL/Fl_Window.H ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Group.H
 Fl_Type.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
 Fl_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
+Fl_Type.o: ../FL/Fl_Pixmap.H lock.xpm
 Fl_Window_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Window_Type.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H
 Fl_Window_Type.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/fl_message.H
@@ -80,11 +81,11 @@ Fluid_Image.o: ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Group.H
 Fluid_Image.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
 Fluid_Image.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
 Fluid_Image.o: ../FL/filename.H ../FL/Fl_File_Chooser.H ../FL/Fl_Window.H
-Fluid_Image.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
-Fluid_Image.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-Fluid_Image.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/Fl_Button.H
-Fluid_Image.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H ../FL/fl_ask.H
-Fluid_Image.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H
+Fluid_Image.o: ../FL/Fl_Button.H ../FL/fl_ask.H ../FL/Fl_File_Browser.H
+Fluid_Image.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
+Fluid_Image.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_File_Icon.H
+Fluid_Image.o: ../FL/Fl.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
+Fluid_Image.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
 code.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Type.h
 code.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h
 code.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H
@@ -133,13 +134,14 @@ fluid.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H
 fluid.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Hold_Browser.H ../FL/Fl_Browser.H
 fluid.o: ../FL/Fl_Browser_.H ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H
 fluid.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/fl_ask.H ../FL/fl_draw.H
-fluid.o: ../FL/Fl_File_Chooser.H ../FL/Fl_Window.H ../FL/Fl_File_Browser.H
-fluid.o: ../FL/Fl_File_Icon.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
-fluid.o: ../FL/Fl_Choice.H ../FL/fl_message.H ../FL/fl_ask.H ../FL/filename.H
-fluid.o: ../src/flstring.h ../config.h about_panel.h ../FL/Fl_Group.H
-fluid.o: Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H
-fluid.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/x.H
-fluid.o: ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H
+fluid.o: ../FL/Fl_File_Chooser.H ../FL/Fl_Window.H ../FL/Fl_Choice.H
+fluid.o: ../FL/Fl_File_Browser.H ../FL/Fl_File_Icon.H
+fluid.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H ../FL/fl_message.H
+fluid.o: ../FL/fl_ask.H ../FL/filename.H ../src/flstring.h ../config.h
+fluid.o: about_panel.h ../FL/Fl_Group.H Fl_Type.h ../FL/Fl_Widget.H
+fluid.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h
+fluid.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Tabs.H
+fluid.o: ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H
 fluid.o: ../FL/Fl_Menu_Button.H
 about_panel.o: about_panel.h ../FL/Fl.H ../FL/Enumerations.H
 about_panel.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H