Update documentation screenshots (still have some to go...)

Cleanup some demos and the color chooser.

Restore code in Fl_Window::hotspot() to keep the window on the screen.


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

3 files changed, 54 insertions, 52 deletions

diff --git a/test/Makefile b/test/Makefile
index 12054e4a9..0d41ca152 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.19.2.7.2.17 2001/12/08 16:23:51 easysw Exp $"
+# "$Id: Makefile,v 1.19.2.7.2.18 2001/12/12 21:33:34 easysw Exp $"
 #
 # Test/example program makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -163,74 +163,76 @@ gldemos:	$(GLALL)
 $(ALL):  ../lib/$(LIBNAME)
 
 # Programs needing special instructions...
-editor$(EXEEXT): editor.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) editor.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
+editor$(EXEEXT): editor.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) editor.o -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
 	$(POSTBUILD)
-file_chooser$(EXEEXT): file_chooser.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) file_chooser.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
+file_chooser$(EXEEXT): file_chooser.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) file_chooser.o -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
 	$(POSTBUILD)
-help$(EXEEXT): help.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) help.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
+help$(EXEEXT): help.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) help.o -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
 	$(POSTBUILD)
-keyboard$(EXEEXT): keyboard.cxx keyboard_ui.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) keyboard.cxx $(LINKFLTK) $(LDLIBS) -o $@
+keyboard$(EXEEXT): keyboard.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) keyboard.o $(LINKFLTK) $(LDLIBS) -o $@
 	$(POSTBUILD)
-mandelbrot$(EXEEXT): mandelbrot.cxx mandelbrot_ui.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx $(LINKFLTK) $(LDLIBS) -o $@
+keyboard.o: keyboard.cxx keyboard_ui.cxx
+
+mandelbrot$(EXEEXT): mandelbrot.o mandelbrot_ui.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) mandelbrot.o $(LINKFLTK) $(LDLIBS) -o $@
 	$(POSTBUILD)
-pixmap_browser$(EXEEXT): pixmap_browser.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) pixmap_browser.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
+pixmap_browser$(EXEEXT): pixmap_browser.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) pixmap_browser.o -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
 	$(POSTBUILD)
 
 # OpenGL demos...
 CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
-	echo Compiling and linking $@...
+	echo Linking $@...
 	$(CXX) $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \
 		$(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
 	$(POSTBUILD)
 CubeMain.o: CubeViewUI.h CubeView.h
 CubeView.o: CubeView.h
 
-cube$(EXEEXT): cube.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) cube.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+cube$(EXEEXT): cube.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
 	$(POSTBUILD)
-fractals$(EXEEXT): fractals.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) fractals.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+fractals$(EXEEXT): fractals.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) fractals.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
 	$(POSTBUILD)
-fullscreen$(EXEEXT): fullscreen.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) fullscreen.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+fullscreen$(EXEEXT): fullscreen.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
 	$(POSTBUILD)
-glpuzzle$(EXEEXT): glpuzzle.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+glpuzzle$(EXEEXT): glpuzzle.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
 	$(POSTBUILD)
-gl_overlay$(EXEEXT): gl_overlay.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) gl_overlay.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+gl_overlay$(EXEEXT): gl_overlay.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
 	$(POSTBUILD)
-shiny$(EXEEXT): shiny.cxx shiny_panel.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) shiny.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+shiny$(EXEEXT): shiny.o shiny_panel.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) shiny.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
 	$(POSTBUILD)
-shape$(EXEEXT): shape.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) shape.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+shape$(EXEEXT): shape.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
 	$(POSTBUILD)
 
 # If you have libjpeg installed, you might want to try this test program:
 
-jpeg_image$(EXEEXT): jpeg_image.cxx
-	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) jpeg_image.cxx $(LINKFLTK) $(LDLIBS) -ljpeg -lXext -o $@
+jpeg_image$(EXEEXT): jpeg_image.o
+	echo Linking $@...
+	$(CXX) -I.. $(CXXFLAGS) jpeg_image.o $(LINKFLTK) $(LDLIBS) -ljpeg -lXext -o $@
 	$(POSTBUILD)
 
 depend:
@@ -247,5 +249,5 @@ uninstall:
 	@echo Nothing to uninstall in test directory.
 
 #
-# End of "$Id: Makefile,v 1.19.2.7.2.17 2001/12/08 16:23:51 easysw Exp $".
+# End of "$Id: Makefile,v 1.19.2.7.2.18 2001/12/12 21:33:34 easysw Exp $".
 #
diff --git a/test/editor.cxx b/test/editor.cxx
index 8aa2129dd..31a732653 100644
--- a/test/editor.cxx
+++ b/test/editor.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: editor.cxx,v 1.2.2.3.2.5 2001/12/09 12:52:13 easysw Exp $"
+// "$Id: editor.cxx,v 1.2.2.3.2.6 2001/12/12 21:33:34 easysw Exp $"
 //
 // A simple text editor program for the Fast Light Tool Kit (FLTK).
 //
@@ -78,10 +78,10 @@ class EditorWindow : public Fl_Double_Window {
 
 EditorWindow::EditorWindow(int w, int h, const char* t) : Fl_Double_Window(w, h, t) {
   replace_dlg = new Fl_Window(300, 105, "Replace");
-    replace_find = new Fl_Input(70, 10, 210, 25, "Find:");
+    replace_find = new Fl_Input(80, 10, 210, 25, "Find:");
     replace_find->align(FL_ALIGN_LEFT);
 
-    replace_with = new Fl_Input(70, 40, 210, 25, "Replace:");
+    replace_with = new Fl_Input(80, 40, 210, 25, "Replace:");
     replace_with->align(FL_ALIGN_LEFT);
 
     replace_all = new Fl_Button(10, 70, 90, 25, "Replace All");
@@ -419,5 +419,5 @@ int main(int argc, char **argv) {
 }
 
 //
-// End of "$Id: editor.cxx,v 1.2.2.3.2.5 2001/12/09 12:52:13 easysw Exp $".
+// End of "$Id: editor.cxx,v 1.2.2.3.2.6 2001/12/12 21:33:34 easysw Exp $".
 //
diff --git a/test/message.cxx b/test/message.cxx
index 0dfe90512..9c476dcf4 100644
--- a/test/message.cxx
+++ b/test/message.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: message.cxx,v 1.5.2.3 2001/01/22 15:13:41 easysw Exp $"
+// "$Id: message.cxx,v 1.5.2.3.2.1 2001/12/12 21:33:34 easysw Exp $"
 //
 // Message test program for the Fast Light Tool Kit (FLTK).
 //
@@ -33,7 +33,7 @@ int main(int, char **) {
   fl_message("Spelling check sucessfull, %d errors found with %g%% confidence",
 	     1002, 100*(15/77.0));
 
-  fl_alert("Quantum fluctuations in the space-time continuim detected, "
+  fl_alert("Quantum fluctuations in the space-time continuum detected, "
 	   "you have %g seconds to comply.", 10.0);
 
   printf("fl_ask returned %d\n",
@@ -54,5 +54,5 @@ int main(int, char **) {
 }
 
 //
-// End of "$Id: message.cxx,v 1.5.2.3 2001/01/22 15:13:41 easysw Exp $".
+// End of "$Id: message.cxx,v 1.5.2.3.2.1 2001/12/12 21:33:34 easysw Exp $".
 //