diff --git a/ANNOUNCEMENT b/ANNOUNCEMENT
index ee78f48c5..90ec74704 100644
--- a/ANNOUNCEMENT
+++ b/ANNOUNCEMENT
@@ -32,6 +32,40 @@ exceptions that allow for static linking.
Changes since FLTK 1.1.3 include:
+ - VC++ 7.1 didn't like how the copy operators were
+ disabled for the Fl_Widget class; now include inline
+ code which will never be used but makes VC++ happy
+ (STR #156)
+ - Fixed an IRIX compile problem caused by a missing
+ #include (STR #157)
+ - FLUID didn't write color/selection_color() calls using
+ the symbolic names when possible, nor did it cast
+ integer colors to Fl_Color (STR #146)
+ - Fl_File_Chooser was very close for multiple file
+ selection in large directories (STR #140)
+ - Fl_Text_Display/Editor did not disable the current
+ selection when focus was shifted to another widget
+ (STR #131)
+ - Fl_Choice didn't use the normal focus box when the
+ plastic scheme was in use (STR #129)
+ - Fl_Text_Editor didn't use selection_color()
+ consistently (STR #130)
+ - The fltk_forms, fltk_gl, and fltk_images DSO's and
+ HP-UX shared libraries are now linked against the fltk
+ shared library to provide complete dependency
+ resolution (STR #118)
+ - The configure.in file did not work with autoconf 2.57.
+ - FLUID didn't redraw widgets when changing the X, Y, W,
+ or H values in the widget panel (STR #120)
+ - Fl_Window::show(argc, argv) wasn't calling
+ Fl::get_system_colors() as documented (STR #119)
+ - DSO (shared library) building wasn't quite right for
+ some platforms (STR #118)
+ - OSX: some changes to make ProjectBuilder compiles
+ possible.
+ - OSX: FLTK would not know where a window was positioned
+ by the OS. As a result, popup menus could open at
+ wrong positions.
- Fl_Window::show(argc,argv) incorrectly opened the
display prior to parsing the arguments; this prevented
the "-display foo" option from working (STR #111)
@@ -231,88 +265,122 @@ exceptions that allow for static linking.
+ - VC++ 7.1 didn't like how the copy operators were
+ disabled for the Fl_Widget class; now include inline
+ code which will never be used but makes VC++ happy
+ (STR #156)
+
- Fixed an IRIX compile problem caused by a missing
+ #include (STR #157)
+
- FLUID didn't write color/selection_color() calls using
+ the symbolic names when possible, nor did it cast
+ integer colors to Fl_Color (STR #146)
+
- Fl_File_Chooser was very close for multiple file
+ selection in large directories (STR #140)
+
- Fl_Text_Display/Editor did not disable the current
+ selection when focus was shifted to another widget
+ (STR #131)
+
- Fl_Choice didn't use the normal focus box when the
+ plastic scheme was in use (STR #129)
+
- Fl_Text_Editor didn't use selection_color()
+ consistently (STR #130)
+
- The fltk_forms, fltk_gl, and fltk_images DSO's and
+ HP-UX shared libraries are now linked against the fltk
+ shared library to provide complete dependency
+ resolution (STR #118)
+
- The configure.in file did not work with autoconf 2.57.
+
- FLUID didn't redraw widgets when changing the X, Y, W,
+ or H values in the widget panel (STR #120)
+
- Fl_Window::show(argc, argv) wasn't calling
+ Fl::get_system_colors() as documented (STR #119)
+
- DSO (shared library) building wasn't quite right for
+ some platforms (STR #118)
+
- OSX: some changes to make ProjectBuilder compiles
+ possible.
+
- OSX: FLTK would not know where a window was positioned
+ by the OS. As a result, popup menus could open at
+ wrong positions.
- Fl_Window::show(argc,argv) incorrectly opened the
display prior to parsing the arguments; this prevented
- the "-display foo" option from working (STR #111)
-
- Images were not clipped properly on MacOS X (STR #114)
+ the "-display foo" option from working (STR #111)
+
- Images were not clipped properly on MacOS X (STR #114)
- Fl::reload_scheme() and Fl::scheme("foo") incorrectly
called Fl::get_system_colors(). This prevented an
application from setting its own color preferences
- (STR #115)
+ (STR #115)
- The 'Enter' key event on OS X would not set Fl::e_text
(STR #???)
- Changed behaviour of fluid to always paste into
- a selected group (STR #88)
+ a selected group (STR #88)
- Menuitem now changes font, even if fontsize
- is not set (STR #110)
-
- Swapped shortcut labels in OS X (STR #86)
+ is not set (STR #110)
+
- Swapped shortcut labels in OS X (STR #86)
- Non-square Fl_Dial would calculate angle from user
- input wrong (STR #101)
-
- Updated documentatiopn of fl_draw (STR #94)
- and Fl_Menu_::add() (STR #99)
+ input wrong (STR #101)
+
- Updated documentatiopn of fl_draw (STR #94)
+ and Fl_Menu_::add() (STR #99)
- Fluid collapse triangle events were not offset by
- horizontal scroll (STR #106)
+ horizontal scroll (STR #106)
- QuitAppleEvent now correctly returns from Fl::run()
- instead of just exiting (STR #87)
+ instead of just exiting (STR #87)
- Hiding the first created OpenGL context was not
- possible. FLTK now manages a list of contexts (STR #77)
+ possible. FLTK now manages a list of contexts (STR #77)
- FLUID didn't keep the double/single buffer type for
windows.
- FLTK didn't work with Xft2.
-
- OSX window resizing didn't work (STR #64)
-
- Fixed MacOS X shared library generation (STR #51)
+
- OSX window resizing didn't work (STR #64)
+
- Fixed MacOS X shared library generation (STR #51)
- Several widgets defined their own size() method but
didn't provide an inline method that mapped to the
- Fl_Widget::size() method (STR #62)
+ Fl_Widget::size() method (STR #62)
- Fl_Scroll didn't provide its own clear() method, so
calling clear() on a Fl_Scroll widget would also
- destroy the scrollbars (STR #75)
+ destroy the scrollbars (STR #75)
- Fl::event_text() was sometimes initialized to NULL
- instead of an empty string (STR #70)
+ instead of an empty string (STR #70)
- fl_draw() didn't properly handle a trailing escaped
- "@" character (STR #84)
+ "@" character (STR #84)
- Added documentation for all forms of
- Fl_Widget::damage() (STR #61)
+ Fl_Widget::damage() (STR #61)
- Fl_Double_Window now has a type() value of
FL_DOUBLE_WINDOW, to allow double-buffered windows to
- process redraws properly on WIN32 (STR #46)
+ process redraws properly on WIN32 (STR #46)
- Added FL_DAMAGE_USER1 and FL_DAMAGE_USER2 damage bits
- for use by widget developers (STR #57)
+ for use by widget developers (STR #57)
- Fl_Help_View didn't support numeric character entities
- (STR #66)
+ (STR #66)
- Menu shortcuts didn't use the Mac key names under
- MacOS X (STR #71)
+ MacOS X (STR #71)
- CodeWarrior Mac OS X updated to work with current
- CW8.3 (STR #34)
+ CW8.3 (STR #34)
- Apple-C/X/V/Z didn't work in the Fl_Input widget due
- to a bad mapping to control keys (STR #79)
+ to a bad mapping to control keys (STR #79)
- Added the OSX-specific fl_open_callback() function to
handle Open Documents messages from the Finder (STR
#80)
- The configure script contained erroneous whitespace in
various tests which caused errors on some platforms
- (STR #60)
+ (STR #60)
- The fltk-config script still supported the deprecated
--prefix and --exec-prefix options; dropped them since
they serve no useful purpose and would never have
- worked for the intended purpose anyways... (STR #56)
+ worked for the intended purpose anyways... (STR #56)
- fl_filename_list returned 0 on Win32 if no directory
- existed (STR #54)
+ existed (STR #54)
- Pressing 'home' after the last letter in a Text_Editor
- would move the cursor to pos 0 (STR #39)
+ would move the cursor to pos 0 (STR #39)
- Fl::get_key(x) would mix up Ctrl and Meta on OS X (STR
#55)
- The configure script used the wrong dynamic library
- linking command for OSX (STR #51)
+ linking command for OSX (STR #51)
- The Fl_Text_Editor widget did not set changed() nor
did it call the widget's callback function for
FL_WHEN_CHANGED when processing characters that
- Fl::compose() handles (STR #52)
+ Fl::compose() handles (STR #52)
- The file chooser did not reset the click count when
changing directories; if you clicked on a file in the
same position after changing directories with a
double
- click, the chooser treated it as a triple
- click (STR #27)
+ click (STR #27)
- Symbols with outlines did not get drawn inactive.
- The Fl_Help_View widget now provides a find() method
to search for text within the page.
@@ -321,20 +389,20 @@ exceptions that allow for static linking.
- The default font encoding on OSX did not match the
default on WIN32 or X11.
- Menu items were not drawn using the font specified in
- the Fl_Menu_Item structure (STR #30)
+ the Fl_Menu_Item structure (STR #30)
- Long menus that were aligned such that the top of an
item was exactly at the top of the screen would not
- scroll (STR #33)
+ scroll (STR #33)
- The OS issues appendix incorrectly stated that MacOS
- 8.6 and 9 were supported; they are not (STR #28)
+ 8.6 and 9 were supported; they are not (STR #28)
- Fixed handling of nested double-buffered windows (STR
#1)
- Showing a subwindow inside a hidden window would crash
- the application (STR #23)
+ the application (STR #23)
- OSX users couldn't enter some special chars when using
- some foreign key layouts (STR #32)
+ some foreign key layouts (STR #32)
- Hiding subwindows on OSX would hide the parent window
- (STR #22)
+ (STR #22)
- Added thin plastic box types.
- Fl_Pack ignored the box() setting and cleared any
unused areas to the widget color; it now only does so
@@ -348,22 +416,22 @@ exceptions that allow for static linking.
better contrast.
- Fl_Text_Display and friends now look for the next
non-punctuation/space character for word boundaries
- (STR #26)
+ (STR #26)
- gl_font() didn't work properly for X11 when Xft was
- used (STR #12)
+ used (STR #12)
- Fl_File_Browser incorrectly included "." on WIN32 (STR
#9)
- Include shellapi.h instead of ShellAPI.h in the WIN32
drag-n-drop code in order to work with the MingW cross
- compiler (STR #6)
+ compiler (STR #6)
- The cursor was not properly restored when doing
- drag-n-drop on X11 (STR #4)
+ drag-n-drop on X11 (STR #4)
- Fl::remove_fd() didn't recalculate the highest file
- descriptor properly (STR #20)
+ descriptor properly (STR #20)
- Fl_Preferences::deleteGroup() didn't work properly
- (STR #13)
+ (STR #13)
- Fixed the fl_show_file_selector() function
- it was
- copying using the wrong string size (STR #14)
+ copying using the wrong string size (STR #14)
- fl_font() and fl_size() were not implemented on MacOS
X.
- Sorted the icon menu bar in fluid.
diff --git a/FL/Fl_File_Chooser.H b/FL/Fl_File_Chooser.H
index c1b3b7bd0..bfdf4e0ba 100644
--- a/FL/Fl_File_Chooser.H
+++ b/FL/Fl_File_Chooser.H
@@ -1,9 +1,9 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0103
+// generated by Fast Light User Interface Designer (fluid) version 1.0104
#ifndef Fl_File_Chooser_H
#define Fl_File_Chooser_H
#include
-#include
+#include
#include
#include
#include
@@ -43,9 +43,9 @@ private:
public:
Fl_File_Chooser(const char *d, const char *p, int t, const char *title);
private:
- Fl_Window *window;
- inline void cb_window_i(Fl_Window*, void*);
- static void cb_window(Fl_Window*, void*);
+ Fl_Double_Window *window;
+ inline void cb_window_i(Fl_Double_Window*, void*);
+ static void cb_window(Fl_Double_Window*, void*);
Fl_Choice *showChoice;
inline void cb_showChoice_i(Fl_Choice*, void*);
static void cb_showChoice(Fl_Choice*, void*);
@@ -76,7 +76,7 @@ private:
static void cb_okButton(Fl_Return_Button*, void*);
inline void cb_Cancel_i(Fl_Button*, void*);
static void cb_Cancel(Fl_Button*, void*);
- Fl_Window *favWindow;
+ Fl_Double_Window *favWindow;
Fl_File_Browser *favList;
inline void cb_favList_i(Fl_File_Browser*, void*);
static void cb_favList(Fl_File_Browser*, void*);
diff --git a/README b/README
index bbff3ad38..22e19beaa 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README - Fast Light Tool Kit (FLTK) Version 1.1.3
+README - Fast Light Tool Kit (FLTK) Version 1.1.4
-------------------------------------------------
WHAT IS FLTK?
diff --git a/documentation/Makefile b/documentation/Makefile
index a6cd0c3ed..21e4598fe 100644
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile,v 1.9.2.10.2.20 2003/01/30 21:40:59 easysw Exp $"
+# "$Id: Makefile,v 1.9.2.10.2.21 2003/09/08 17:11:44 easysw Exp $"
#
# Documentation makefile for the Fast Light Tool Kit (FLTK).
#
@@ -262,18 +262,18 @@ fltk.d/index.html: $(HTMLFILES) $(IMAGEFILES)
echo "Generating HTML documentation..."
-$(RMDIR) fltk.d
-$(MKDIR) fltk.d
- $(HTMLDOC) --verbose --batch fltk.book -d fltk.d -t html
+ -$(HTMLDOC) --verbose --batch fltk.book -d fltk.d -t html
fltk.ps: $(HTMLFILES) $(IMAGEFILES)
echo "Generating PostScript documentation..."
$(RM) fltk.ps
- $(HTMLDOC) --verbose --batch fltk.book $(MEDIA) -f fltk.ps
+ -$(HTMLDOC) --verbose --batch fltk.book $(MEDIA) -f fltk.ps
fltk.pdf: $(HTMLFILES) $(IMAGEFILES)
echo "Generating PDF documentation..."
$(RM) fltk.pdf
- $(HTMLDOC) --verbose --batch fltk.book $(MEDIA) -f fltk.pdf
+ -$(HTMLDOC) --verbose --batch fltk.book $(MEDIA) -f fltk.pdf
#
-# End of "$Id: Makefile,v 1.9.2.10.2.20 2003/01/30 21:40:59 easysw Exp $".
+# End of "$Id: Makefile,v 1.9.2.10.2.21 2003/09/08 17:11:44 easysw Exp $".
#
diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx
index 009717495..d79da30d4 100644
--- a/src/Fl_File_Chooser.cxx
+++ b/src/Fl_File_Chooser.cxx
@@ -1,14 +1,14 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0103
+// generated by Fast Light User Interface Designer (fluid) version 1.0104
#include "../FL/Fl_File_Chooser.H"
-inline void Fl_File_Chooser::cb_window_i(Fl_Window*, void*) {
+inline void Fl_File_Chooser::cb_window_i(Fl_Double_Window*, void*) {
fileName->value("");
fileList->deselect();
Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
window->hide();
}
-void Fl_File_Chooser::cb_window(Fl_Window* o, void* v) {
+void Fl_File_Chooser::cb_window(Fl_Double_Window* o, void* v) {
((Fl_File_Chooser*)(o->user_data()))->cb_window_i(o,v);
}
@@ -131,8 +131,8 @@ void Fl_File_Chooser::cb_favOkButton(Fl_Return_Button* o, void* v) {
}
Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char *title) {
- Fl_Window* w;
- { Fl_Window* o = window = new Fl_Window(490, 380, "Choose File");
+ Fl_Double_Window* w;
+ { Fl_Double_Window* o = window = new Fl_Double_Window(490, 380, "Choose File");
w = o;
o->callback((Fl_Callback*)cb_window, (void*)(this));
{ Fl_Group* o = new Fl_Group(65, 10, 415, 25);
@@ -185,22 +185,22 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char
}
o->end();
}
- { Fl_File_Input* o = fileName = new Fl_File_Input(85, 300, 395, 35);
+ { Fl_File_Input* o = fileName = new Fl_File_Input(115, 300, 365, 35);
o->callback((Fl_Callback*)cb_fileName);
o->when(FL_WHEN_ENTER_KEY);
Fl_Group::current()->resizable(o);
fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY_ALWAYS);
}
- { Fl_Box* o = new Fl_Box(0, 310, 85, 25, "Filename:");
+ { Fl_Box* o = new Fl_Box(10, 310, 105, 25, "Filename:");
o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
o->label(filename_label);
}
{ Fl_Group* o = new Fl_Group(10, 345, 470, 25);
- { Fl_Return_Button* o = okButton = new Fl_Return_Button(320, 345, 75, 25, "OK");
+ { Fl_Return_Button* o = okButton = new Fl_Return_Button(300, 345, 85, 25, "OK");
o->callback((Fl_Callback*)cb_okButton);
okButton->label(fl_ok);
}
- { Fl_Button* o = new Fl_Button(405, 345, 75, 25, "Cancel");
+ { Fl_Button* o = new Fl_Button(395, 345, 85, 25, "Cancel");
o->callback((Fl_Callback*)cb_Cancel);
o->label(fl_cancel);
}
@@ -215,7 +215,7 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char
o->set_modal();
o->end();
}
- { Fl_Window* o = favWindow = new Fl_Window(355, 150, "Manage Favorites");
+ { Fl_Double_Window* o = favWindow = new Fl_Double_Window(355, 150, "Manage Favorites");
w = o;
o->user_data((void*)(this));
{ Fl_File_Browser* o = favList = new Fl_File_Browser(10, 10, 300, 95);
diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl
index 05e715f5a..94437205d 100644
--- a/src/Fl_File_Chooser.fl
+++ b/src/Fl_File_Chooser.fl
@@ -1,8 +1,8 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0103
+version 1.0104
header_name {../FL/Fl_File_Chooser.H}
code_name {.cxx}
-class FL_EXPORT Fl_File_Chooser {open selected
+class FL_EXPORT Fl_File_Chooser {open
} {
decl {enum { SINGLE = 0, MULTI = 1, CREATE = 2, DIRECTORY = 4 };} {public
}
@@ -30,11 +30,11 @@ class FL_EXPORT Fl_File_Chooser {open selected
fileList->deselect();
Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
window->hide();} open
- private xywh {153 80 490 380} hide resizable
+ private xywh {153 80 490 380} type Double resizable
code0 {if (title) window->label(title);}
code1 {\#include }
code2 {\#include }
- code3 {\#include } modal
+ code3 {\#include } modal visible
} {
Fl_Group {} {
private xywh {65 10 415 25}
@@ -89,12 +89,12 @@ window->hide();} open
}
Fl_File_Input fileName {
callback {fileNameCB();}
- private xywh {85 300 395 35} when 8 resizable
+ private xywh {115 300 365 35} when 8 resizable
code0 {fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY_ALWAYS);}
}
Fl_Box {} {
label {Filename:}
- private xywh {0 310 85 25} align 24
+ private xywh {10 310 105 25} align 24
code0 {o->label(filename_label);}
}
Fl_Group {} {open
@@ -106,8 +106,8 @@ window->hide();} open
if (callback_)
(*callback_)(this, data_);
-window->hide();}
- private xywh {320 345 75 25}
+window->hide();} selected
+ private xywh {300 345 85 25}
code0 {\#include }
code1 {okButton->label(fl_ok);}
}
@@ -117,7 +117,7 @@ window->hide();}
fileList->deselect();
Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
window->hide();}
- private xywh {405 345 75 25}
+ private xywh {395 345 85 25}
code0 {o->label(fl_cancel);}
}
Fl_Box {} {
@@ -128,7 +128,7 @@ window->hide();}
}
Fl_Window favWindow {
label {Manage Favorites}
- private xywh {580 44 355 150} hide
+ private xywh {580 44 355 150} type Double hide
code0 {favWindow->label(manage_favorites_label);} modal
} {
Fl_File_Browser favList {