The Fl_File_Chooser window now properly resizes its controls (STR

#766)

The Fl_Help_Dialog window now properly resizes its controls (STR
#768)

The Fl_File_Chooser favorites window is now resizable (STR #770)

Added more documentation on the file chooser filter pattern format
(in both functions.html and Fl_File_Chooser.html)

Added Fl_File_Chooser::save_label (for favorites dialog) and
Fl_File_Chooser::ok_label() to change the default "OK" button
label to something more appropriate according to the HIG.



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

1 files changed, 80 insertions, 44 deletions

diff --git a/src/Fl_Help_Dialog.cxx b/src/Fl_Help_Dialog.cxx
index 5d03cc7fc..4b4e7eb1b 100644
--- a/src/Fl_Help_Dialog.cxx
+++ b/src/Fl_Help_Dialog.cxx
@@ -1,4 +1,31 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0105
+//
+// "$Id$"
+//
+// Fl_Help_Dialog dialog for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2005 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+// generated by Fast Light User Interface Designer (fluid) version 1.0107
 
 #include "../FL/Fl_Help_Dialog.H"
 #include "flstring.h"
@@ -43,7 +70,7 @@ inline void Fl_Help_Dialog::cb_Close_i(Fl_Button*, void*) {
   window_->hide();
 }
 void Fl_Help_Dialog::cb_Close(Fl_Button* o, void* v) {
-  ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_Close_i(o,v);
+  ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_Close_i(o,v);
 }
 
 inline void Fl_Help_Dialog::cb_back__i(Fl_Button*, void*) {
@@ -63,7 +90,7 @@ if (strcmp(view_->filename(), file_[index_]) != 0)
 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);
+  ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_back__i(o,v);
 }
 
 inline void Fl_Help_Dialog::cb_forward__i(Fl_Button*, void*) {
@@ -83,7 +110,7 @@ if (strcmp(view_->filename(), file_[index_]) != 0)
 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);
+  ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_forward__i(o,v);
 }
 
 inline void Fl_Help_Dialog::cb_smaller__i(Fl_Button*, void*) {
@@ -95,7 +122,7 @@ if (view_->textsize() <= 8)
 larger_->activate();
 }
 void Fl_Help_Dialog::cb_smaller_(Fl_Button* o, void* v) {
-  ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_smaller__i(o,v);
+  ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_smaller__i(o,v);
 }
 
 inline void Fl_Help_Dialog::cb_larger__i(Fl_Button*, void*) {
@@ -107,14 +134,14 @@ if (view_->textsize() >= 18)
 smaller_->activate();
 }
 void Fl_Help_Dialog::cb_larger_(Fl_Button* o, void* v) {
-  ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_larger__i(o,v);
+  ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_larger__i(o,v);
 }
 
 inline void Fl_Help_Dialog::cb_find__i(Fl_Input*, void*) {
   find_pos_ = view_->find(find_->value(), find_pos_);
 }
 void Fl_Help_Dialog::cb_find_(Fl_Input* o, void* v) {
-  ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_find__i(o,v);
+  ((Fl_Help_Dialog*)(o->parent()->parent()->parent()->user_data()))->cb_find__i(o,v);
 }
 
 Fl_Help_Dialog::Fl_Help_Dialog() {
@@ -136,43 +163,48 @@ Fl_Help_Dialog::Fl_Help_Dialog() {
       o->end();
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Button* o = new Fl_Button(425, 350, 95, 25, "Close");
-      o->callback((Fl_Callback*)cb_Close);
-      o->label(fl_close);
-    }
-    { Fl_Button* o = back_ = new Fl_Button(355, 350, 25, 25, "@<-");
-      o->tooltip("Show the previous help page.");
-      o->shortcut(0xff51);
-      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((Fl_Color)2);
-      o->callback((Fl_Callback*)cb_forward_);
-    }
-    { Fl_Button* o = smaller_ = new Fl_Button(285, 350, 25, 25, "F");
-      o->tooltip("Make the help text smaller.");
-      o->labelfont(1);
-      o->labelsize(10);
-      o->callback((Fl_Callback*)cb_smaller_);
-    }
-    { Fl_Button* o = larger_ = new Fl_Button(320, 350, 25, 25, "F");
-      o->tooltip("Make the help text larger.");
-      o->labelfont(1);
-      o->labelsize(16);
-      o->callback((Fl_Callback*)cb_larger_);
-    }
-    { Fl_Group* o = new Fl_Group(10, 350, 265, 25);
-      o->box(FL_DOWN_BOX);
-      o->color(FL_BACKGROUND2_COLOR);
-      { Fl_Input* o = find_ = new Fl_Input(35, 352, 238, 21, "@search");
-        o->tooltip("find text in document");
-        o->box(FL_FLAT_BOX);
-        o->labelsize(13);
-        o->callback((Fl_Callback*)cb_find_);
-        o->when(FL_WHEN_ENTER_KEY_ALWAYS);
+    { Fl_Group* o = new Fl_Group(10, 348, 510, 27);
+      { Fl_Button* o = new Fl_Button(456, 350, 64, 25, "Close");
+        o->callback((Fl_Callback*)cb_Close);
+        o->label(fl_close);
+      }
+      { Fl_Button* o = back_ = new Fl_Button(386, 350, 25, 25, "@<-");
+        o->tooltip("Show the previous help page.");
+        o->shortcut(0xff51);
+        o->labelcolor((Fl_Color)2);
+        o->callback((Fl_Callback*)cb_back_);
+      }
+      { Fl_Button* o = forward_ = new Fl_Button(421, 350, 25, 25, "@->");
+        o->tooltip("Show the next help page.");
+        o->shortcut(0xff53);
+        o->labelcolor((Fl_Color)2);
+        o->callback((Fl_Callback*)cb_forward_);
+      }
+      { Fl_Button* o = smaller_ = new Fl_Button(316, 350, 25, 25, "F");
+        o->tooltip("Make the help text smaller.");
+        o->labelfont(1);
+        o->labelsize(10);
+        o->callback((Fl_Callback*)cb_smaller_);
+      }
+      { Fl_Button* o = larger_ = new Fl_Button(351, 350, 25, 25, "F");
+        o->tooltip("Make the help text larger.");
+        o->labelfont(1);
+        o->labelsize(16);
+        o->callback((Fl_Callback*)cb_larger_);
+      }
+      { Fl_Group* o = new Fl_Group(10, 350, 296, 25);
+        o->box(FL_DOWN_BOX);
+        o->color(FL_BACKGROUND2_COLOR);
+        { Fl_Input* o = find_ = new Fl_Input(35, 352, 268, 21, "@search");
+          o->tooltip("find text in document");
+          o->box(FL_FLAT_BOX);
+          o->labelsize(13);
+          o->callback((Fl_Callback*)cb_find_);
+          o->when(FL_WHEN_ENTER_KEY_ALWAYS);
+          Fl_Group::current()->resizable(o);
+        }
+        o->end();
+        Fl_Group::current()->resizable(o);
       }
       o->end();
     }
@@ -263,3 +295,7 @@ int Fl_Help_Dialog::x() {
 int Fl_Help_Dialog::y() {
   return (window_->y());
 }
+
+//
+// End of "$Id$".
+//