Watcom fixes (STR #584, STR #594, STR #595)

Fixed library include order when building DSOs on MacOS X (STR
#596)

fl_xid() could cause a WIN32 application to crash (STR #560, STR
#576, STR #618)

Fl_Browser::remove_() removed the item from the list before
computing the item height, which caused problems with some
programs (STR #613)


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

3 files changed, 79 insertions, 2 deletions

diff --git a/fluid/about_panel.cxx b/fluid/about_panel.cxx
index c60ef03e3..754630019 100644
--- a/fluid/about_panel.cxx
+++ b/fluid/about_panel.cxx
@@ -85,7 +85,7 @@ Fl_Window* make_about_panel() {
         o->labelcolor(7);
         o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE);
       }
-      { Fl_Box* o = new Fl_Box(140, 27, 160, 123, "FLTK User\nInterface\nDesigner\nVersion 1.1.5");
+      { Fl_Box* o = new Fl_Box(140, 27, 160, 123, "FLTK User\nInterface\nDesigner\nVersion 1.1.6");
         o->box(FL_OVAL_BOX);
         o->color(12);
         o->selection_color(47);
diff --git a/fluid/about_panel.fl b/fluid/about_panel.fl
index ed2f86da3..8fd23966b 100644
--- a/fluid/about_panel.fl
+++ b/fluid/about_panel.fl
@@ -49,7 +49,7 @@ Function {make_about_panel()} {open
         label {FLTK User
 Interface
 Designer
-Version 1.1.5}
+Version 1.1.6}
         xywh {140 27 160 123} box OVAL_BOX color 12 selection_color 47 labeltype SHADOW_LABEL labelfont 1 labelsize 18 labelcolor 7
       }
       Fl_Button {} {
diff --git a/fluid/makefile.wat b/fluid/makefile.wat
new file mode 100644
index 000000000..01a5abbcc
--- /dev/null
+++ b/fluid/makefile.wat
@@ -0,0 +1,77 @@
+#
+# "$Id: makefile.wat,v 1.1.2.1 2004/11/20 03:19:58 easysw Exp $"
+#
+# FLUID makefile for the Fast Light Tool Kit (FLTK).
+#
+# Copyright 1998-2004 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 to "fltk-bugs@fltk.org".
+#
+
+CPPFILES = &
+    Fl_Function_Type.obj &
+    Fl_Menu_Type.obj &
+    Fl_Group_Type.obj &
+    Fl_Widget_Type.obj &
+    Fl_Type.obj &
+    Fl_Window_Type.obj &
+    Fluid_Image.obj &
+    code.obj &
+    factory.obj &
+    file.obj &
+    fluid.obj &
+    align_widget.obj &
+    about_panel.obj &
+    widget_panel.obj &
+    alignment_panel.obj &
+    function_panel.obj
+
+################################################################
+
+OBJECTS = $(CPPFILES)
+EXTRA_LIBS = uuid.lib
+
+!include ../watcom.mif
+
+all:  $(ODIR)/fluid$(EXEEXT)
+
+$(ODIR)\fluid$(EXEEXT): $(OBJECTS) $(LIBS)
+
+#
+# Clean all directories
+#
+clean : .SYMBOLIC
+    @echo Cleaning up.
+CLEANEXTS = exe map sym obj lk1
+    @for %a in ($(CLEANEXTS)) do -rm -f $(ODIR)\*.%a
+    -rm -f *.err
+
+#
+# Note: The rebuild target can only be used if you have the original .fl
+#       files.  This is normally only used by the FLTK maintainers...
+#
+
+rebuild:
+    ./fluid -c about_panel.fl
+    ./fluid -c alignment_panel.fl
+    ./fluid -c function_panel.fl
+    ./fluid -c widget_panel.fl
+
+#
+# End of "$Id: makefile.wat,v 1.1.2.1 2004/11/20 03:19:58 easysw Exp $".
+#