Fl_Value_Slider::draw_bg() didn't always apply the clipping

rectangle (STR #235)

fl_filename_relative() returned the wrong string if the absolute
pathname was equal to the current working directory (STR #224)

Fl_Help_Dialog didn't correctly restore the scroll position when
going forward/back in the link history if the file changed (STR
#218)

glutGetModifiers() did not mask off extra state bits, confusing
some GLUT-based applications (STR #213)

Fixed mouse capture problems on MacOS X (STR #209, STR #229)

Fl_Sys_Menu_Bar is now built into the library for MacOS X (STR
#229)

Fl_Menu_ now provides item_pathname() methods to get the
"pathname" of a menu item, e.g. "File/Quit" (STR #283)

Fl_Text_Display now provides cursor_color() methods to get and
set the cursor color (STR #271)

Fl_Scroll didn't honor FL_NO_BOX (STR #305)

FLUID declaration blocks didn't support public/private
definitions (STR #301)


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

1 files changed, 12 insertions, 8 deletions

diff --git a/src/Fl_Help_Dialog.cxx b/src/Fl_Help_Dialog.cxx
index eab956c1b..aadee5495 100644
--- a/src/Fl_Help_Dialog.cxx
+++ b/src/Fl_Help_Dialog.cxx
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0104
+// generated by Fast Light User Interface Designer (fluid) version 1.0105
 
 #include "../FL/Fl_Help_Dialog.H"
 #include "flstring.h"
@@ -55,10 +55,12 @@ if (index_ == 0)
 
 forward_->activate();
 
+int l = line_[index_];
+
 if (strcmp(view_->filename(), file_[index_]) != 0)
   view_->load(file_[index_]);
 
-view_->topline(line_[index_]);
+view_->topline(l);
 }
 void Fl_Help_Dialog::cb_back_(Fl_Button* o, void* v) {
   ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_back__i(o,v);
@@ -73,10 +75,12 @@ if (index_ >= max_)
 
 back_->activate();
 
+int l = view_->topline();
+
 if (strcmp(view_->filename(), file_[index_]) != 0)
   view_->load(file_[index_]);
 
-view_->topline(line_[index_]);
+view_->topline(l);
 }
 void Fl_Help_Dialog::cb_forward_(Fl_Button* o, void* v) {
   ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_forward__i(o,v);
@@ -120,12 +124,12 @@ Fl_Help_Dialog::Fl_Help_Dialog() {
     o->user_data((void*)(this));
     { Fl_Help_View* o = view_ = new Fl_Help_View(10, 10, 510, 330);
       o->box(FL_DOWN_BOX);
-      o->color(49);
-      o->selection_color(15);
+      o->color(FL_BACKGROUND_COLOR);
+      o->selection_color(FL_SELECTION_COLOR);
       o->labeltype(FL_NORMAL_LABEL);
       o->labelfont(0);
       o->labelsize(14);
-      o->labelcolor(56);
+      o->labelcolor(FL_BLACK);
       o->callback((Fl_Callback*)cb_view_);
       o->align(FL_ALIGN_TOP);
       o->when(FL_WHEN_RELEASE);
@@ -139,13 +143,13 @@ Fl_Help_Dialog::Fl_Help_Dialog() {
     { Fl_Button* o = back_ = new Fl_Button(355, 350, 25, 25, "@<-");
       o->tooltip("Show the previous help page.");
       o->shortcut(0xff51);
-      o->labelcolor(2);
+      o->labelcolor((Fl_Color)2);
       o->callback((Fl_Callback*)cb_back_);
     }
     { Fl_Button* o = forward_ = new Fl_Button(390, 350, 25, 25, "@->");
       o->tooltip("Show the next help page.");
       o->shortcut(0xff53);
-      o->labelcolor(2);
+      o->labelcolor((Fl_Color)2);
       o->callback((Fl_Callback*)cb_forward_);
     }
     { Fl_Button* o = smaller_ = new Fl_Button(285, 350, 25, 25, "F");