Documentation updates (STR #570)

Added DESTDIR support and now remove all man pages for the
"uninstall" target (STR #545)

Fix PNG drawing on buggy WIN32 graphics cards (STR #548)

The configure script didn't propagate the CPPFLAGS environment
variable (STR #549)

The numpad keys didn't work properly on WIN32 (STR #502)

fl_input() and friends now set the input focus to the text field
when the dialog is shown (STR #553)

Fixed background color mixup when drawing Fl_Choice menus (STR
#544)

Fixed MingW makefiles (STR #550)

More VC++ project file tweaking (STR #559)

Fl_PNG_Image didn't use the png_set_trns_to_alpha function when
available (STR #547)

The FL_UNFOCUS event wasn't always sent when switching tabs (STR
#558)


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

6 files changed, 168 insertions, 107 deletions

diff --git a/src/Fl_Group.cxx b/src/Fl_Group.cxx
index 75178cecc..522ff0da3 100644
--- a/src/Fl_Group.cxx
+++ b/src/Fl_Group.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Group.cxx,v 1.8.2.8.2.24 2004/04/11 04:38:57 easysw Exp $"
+// "$Id: Fl_Group.cxx,v 1.8.2.8.2.25 2004/10/18 20:22:22 easysw Exp $"
 //
 // Group widget for the Fast Light Tool Kit (FLTK).
 //
@@ -225,6 +225,11 @@ int Fl_Group::handle(int event) {
   case FL_HIDE:
     for (i = children(); i--;) {
       o = *a++;
+      if (event == FL_HIDE && o == Fl::focus()) {
+        // Give up input focus...
+        o->handle(FL_UNFOCUS);
+	Fl::focus(0);
+      }
       if (o->visible()) o->handle(event);
     }
     return 1;
@@ -586,5 +591,5 @@ void Fl_Group::draw_outside_label(const Fl_Widget& widget) const {
 }
 
 //
-// End of "$Id: Fl_Group.cxx,v 1.8.2.8.2.24 2004/04/11 04:38:57 easysw Exp $".
+// End of "$Id: Fl_Group.cxx,v 1.8.2.8.2.25 2004/10/18 20:22:22 easysw Exp $".
 //
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index 7a62f0a2d..3d0359af2 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.33 2004/07/26 20:52:51 easysw Exp $"
+// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.34 2004/10/18 20:22:23 easysw Exp $"
 //
 // Menu code for the Fast Light Tool Kit (FLTK).
 //
@@ -378,7 +378,7 @@ void menutitle::draw() {
 
 void menuwindow::draw() {
   if (damage() != FL_DAMAGE_CHILD) {	// complete redraw
-    fl_draw_box(box(), 0, 0, w(), h(), color());
+    fl_draw_box(box(), 0, 0, w(), h(), button ? button->color() : color());
     if (menu) {
       const Fl_Menu_Item* m; int j;
       for (m=menu->first(), j=0; m->text; j++, m = m->next()) drawentry(m, j, 0);
@@ -791,5 +791,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const {
 }
 
 //
-// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.33 2004/07/26 20:52:51 easysw Exp $".
+// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.34 2004/10/18 20:22:23 easysw Exp $".
 //
diff --git a/src/Fl_PNG_Image.cxx b/src/Fl_PNG_Image.cxx
index 61e4c4f9f..d9ddaeff4 100644
--- a/src/Fl_PNG_Image.cxx
+++ b/src/Fl_PNG_Image.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_PNG_Image.cxx,v 1.1.2.11 2004/04/11 04:38:58 easysw Exp $"
+// "$Id: Fl_PNG_Image.cxx,v 1.1.2.12 2004/10/18 20:22:24 easysw Exp $"
 //
 // Fl_PNG_Image routines.
 //
@@ -108,11 +108,11 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
   else if (info->bit_depth == 16)
     png_set_strip_16(pp);
 
-#  if defined(HAVE_PNG_GET_VALID) && defined(HAVE_SET_TRNS_TO_ALPHA)
+#  if defined(HAVE_PNG_GET_VALID) && defined(HAVE_PNG_SET_TRNS_TO_ALPHA)
   // Handle transparency...
   if (png_get_valid(pp, info, PNG_INFO_tRNS))
     png_set_tRNS_to_alpha(pp);
-#  endif // HAVE_PNG_GET_VALID && HAVE_SET_TRNS_TO_ALPHA
+#  endif // HAVE_PNG_GET_VALID && HAVE_PNG_SET_TRNS_TO_ALPHA
 
   array = new uchar[w() * h() * d()];
   alloc_array = 1;
@@ -127,6 +127,16 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
   for (i = png_set_interlace_handling(pp); i > 0; i --)
     png_read_rows(pp, rows, NULL, h());
 
+#ifdef WIN32
+  // Some Windows graphics drivers don't honor transparency when RGB == white
+  if (channels == 4) {
+    // Convert RGB to 0 when alpha == 0...
+    uchar *ptr = (uchar *)array;
+    for (i = w() * h(); i > 0; i --, ptr += 4)
+      if (!ptr[3]) ptr[0] = ptr[1] = ptr[2] = 0;
+  }
+#endif // WIN32
+
   // Free memory and return...
   delete[] rows;
 
@@ -139,5 +149,5 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
 
 
 //
-// End of "$Id: Fl_PNG_Image.cxx,v 1.1.2.11 2004/04/11 04:38:58 easysw Exp $".
+// End of "$Id: Fl_PNG_Image.cxx,v 1.1.2.12 2004/10/18 20:22:24 easysw Exp $".
 //
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index d05427622..4e73eaf6d 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_win32.cxx,v 1.33.2.37.2.49 2004/06/01 01:08:50 easysw Exp $"
+// "$Id: Fl_win32.cxx,v 1.33.2.37.2.50 2004/10/18 20:22:24 easysw Exp $"
 //
 // WIN32-specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -726,10 +726,55 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
     if (uMsg == WM_CHAR || uMsg == WM_SYSCHAR) {
       buffer[0] = char(wParam);
       Fl::e_length = 1;
-    } else if (Fl::e_keysym >= FL_KP && Fl::e_keysym <= FL_KP_Last &&
-               (state & FL_NUM_LOCK)) {
-      buffer[0] = Fl::e_keysym-FL_KP;
-      Fl::e_length = 1;
+    } else if (Fl::e_keysym >= FL_KP && Fl::e_keysym <= FL_KP_Last) {
+      if (state & FL_NUM_LOCK) {
+        // Convert to regular keypress...
+	buffer[0] = Fl::e_keysym-FL_KP;
+	Fl::e_length = 1;
+      } else {
+        // Convert to special keypress...
+	buffer[0] = 0;
+	Fl::e_length = 0;
+	switch (Fl::e_keysym) {
+	  case FL_KP + '0' :
+	    Fl::e_keysym = Fl_Insert;
+	    break;
+	  case FL_KP + '1' :
+	    Fl::e_keysym = Fl_End;
+	    break;
+	  case FL_KP + '2' :
+	    Fl::e_keysym = Fl_Down;
+	    break;
+	  case FL_KP + '3' :
+	    Fl::e_keysym = Fl_Page_Down;
+	    break;
+	  case FL_KP + '4' :
+	    Fl::e_keysym = Fl_Left;
+	    break;
+	  case FL_KP + '6' :
+	    Fl::e_keysym = Fl_Right;
+	    break;
+	  case FL_KP + '7' :
+	    Fl::e_keysym = Fl_Home;
+	    break;
+	  case FL_KP + '8' :
+	    Fl::e_keysym = Fl_Up;
+	    break;
+	  case FL_KP + '9' :
+	    Fl::e_keysym = Fl_Page_Up;
+	    break;
+	  case FL_KP + '.' :
+	    Fl::e_keysym = Fl_Delete;
+	    break;
+	  case FL_KP + '/' :
+	  case FL_KP + '*' :
+	  case FL_KP + '-' :
+	  case FL_KP + '+' :
+	    buffer[0] = Fl::e_keysym-FL_KP;
+	    Fl::e_length = 1;
+	    break;
+	}
+      }
     } else {
       buffer[0] = 0;
       Fl::e_length = 0;
@@ -1196,5 +1241,5 @@ void Fl_Window::make_current() {
 }
 
 //
-// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.49 2004/06/01 01:08:50 easysw Exp $".
+// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.50 2004/10/18 20:22:24 easysw Exp $".
 //
diff --git a/src/Makefile b/src/Makefile
index afb037005..016ddd5e5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.18.2.14.2.57 2004/07/23 19:26:26 easysw Exp $"
+# "$Id: Makefile,v 1.18.2.14.2.58 2004/10/18 20:22:25 easysw Exp $"
 #
 # Library makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -419,169 +419,169 @@ install: $(LIBNAME) $(DSONAME) \
 	$(FLLIBNAME) $(FLDSONAME) \
 	$(GLLIBNAME) $(GLDSONAME) \
 	$(IMGLIBNAME) $(IMGDSONAME)
-	echo "Installing libraries in $(libdir)..."
-	-$(MKDIR) $(libdir)
-	$(RM) $(libdir)/$(LIBNAME)
-	-$(CP) $(LIBNAME) $(FLLIBNAME) $(GLLIBNAME) $(IMGLIBNAME) $(libdir)
-	$(RANLIB) $(libdir)/$(LIBNAME)
-	$(RANLIB) $(libdir)/$(FLLIBNAME)
+	echo "Installing libraries in $(DESTDIR)$(libdir)..."
+	-$(MKDIR) $(DESTDIR)$(libdir)
+	$(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
+	-$(CP) $(LIBNAME) $(FLLIBNAME) $(GLLIBNAME) $(IMGLIBNAME) $(DESTDIR)$(libdir)
+	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
+	$(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME)
 	if test x$(GLLIBNAME) != x; then \
-		$(RANLIB) $(libdir)/$(GLLIBNAME); \
+		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
 	fi
-	$(RANLIB) $(libdir)/$(IMGLIBNAME)
+	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
 	if test x$(DSONAME) = xlibfltk.so.1.1; then\
-		$(RM) $(libdir)/libfltk.so*;\
-		$(CP) libfltk.so.1.1 $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk.so.1.1; \
-		$(LN) libfltk.so.1.1 $(libdir)/libfltk.so;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
+		$(CP) libfltk.so.1.1 $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.so.1.1; \
+		$(LN) libfltk.so.1.1 $(DESTDIR)$(libdir)/libfltk.so;\
 	fi
 	if test x$(DSONAME) = xlibfltk.sl.1.1; then\
-		$(RM) $(libdir)/libfltk.sl*;\
-		$(CP) libfltk.sl.1.1 $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk.sl.1.1; \
-		$(LN) libfltk.sl.1.1 $(libdir)/libfltk.sl;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
+		$(CP) libfltk.sl.1.1 $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.sl.1.1; \
+		$(LN) libfltk.sl.1.1 $(DESTDIR)$(libdir)/libfltk.sl;\
 	fi
 	if test x$(DSONAME) = xlibfltk.1.1.dylib; then\
-		$(RM) $(libdir)/libfltk.*dylib;\
-		$(CP) libfltk.1.1.dylib $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk.1.1.dylib; \
-		$(LN) libfltk.1.1.dylib $(libdir)/libfltk.dylib;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\
+		$(CP) libfltk.1.1.dylib $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.1.1.dylib; \
+		$(LN) libfltk.1.1.dylib $(DESTDIR)$(libdir)/libfltk.dylib;\
 	fi
 	if test x$(DSONAME) = xlibfltk_s.a; then\
-		$(RM) $(libdir)/libfltk_s.a;\
-		$(CP) libfltk_s.a $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk_s.a; \
+		$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
+		$(CP) libfltk_s.a $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_s.a; \
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
-		$(RM) $(libdir)/libfltk_forms.so*;\
-		$(CP) libfltk_forms.so.1.1 $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk_forms.so.1.1; \
-		$(LN) libfltk_forms.so.1.1 $(libdir)/libfltk_forms.so;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\
+		$(CP) libfltk_forms.so.1.1 $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.so.1.1; \
+		$(LN) libfltk_forms.so.1.1 $(DESTDIR)$(libdir)/libfltk_forms.so;\
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
-		$(RM) $(libdir)/libfltk_forms.sl*;\
-		$(CP) libfltk_forms.sl.1.1 $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk_forms.sl.1.1; \
-		$(LN) libfltk_forms.sl.1.1 $(libdir)/libfltk_forms.sl;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
+		$(CP) libfltk_forms.sl.1.1 $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.sl.1.1; \
+		$(LN) libfltk_forms.sl.1.1 $(DESTDIR)$(libdir)/libfltk_forms.sl;\
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms.1.1.dylib; then\
-		$(RM) $(libdir)/libfltk_forms.*dylib;\
-		$(CP) libfltk_forms.1.1.dylib $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk_forms.1.1.dylib; \
-		$(LN) libfltk_forms.1.1.dylib $(libdir)/libfltk_forms.dylib;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.*dylib;\
+		$(CP) libfltk_forms.1.1.dylib $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.1.1.dylib; \
+		$(LN) libfltk_forms.1.1.dylib $(DESTDIR)$(libdir)/libfltk_forms.dylib;\
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\
-		$(RM) $(libdir)/libfltk_forms_s.a;\
-		$(CP) libfltk_forms_s.a $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk_forms.a; \
+		$(RM) $(DESTDIR)$(libdir)/libfltk_forms_s.a;\
+		$(CP) libfltk_forms_s.a $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.a; \
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
-		$(RM) $(libdir)/libfltk_gl.so*;\
-		$(CP) libfltk_gl.so.1.1 $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk_gl.so.1.1; \
-		$(LN) libfltk_gl.so.1.1 $(libdir)/libfltk_gl.so;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
+		$(CP) libfltk_gl.so.1.1 $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.so.1.1; \
+		$(LN) libfltk_gl.so.1.1 $(DESTDIR)$(libdir)/libfltk_gl.so;\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
-		$(RM) $(libdir)/libfltk_gl.sl*;\
-		$(CP) libfltk_gl.sl.1.1 $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk_gl.sl.1.1; \
-		$(LN) libfltk_gl.sl.1.1 $(libdir)/libfltk_gl.sl;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
+		$(CP) libfltk_gl.sl.1.1 $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.sl.1.1; \
+		$(LN) libfltk_gl.sl.1.1 $(DESTDIR)$(libdir)/libfltk_gl.sl;\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.1.1.dylib; then\
-		$(RM) $(libdir)/libfltk_gl.*dylib;\
-		$(CP) libfltk_gl.1.1.dylib $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk_gl.1.1.dylib; \
-		$(LN) libfltk_gl.1.1.dylib $(libdir)/libfltk_gl.dylib;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\
+		$(CP) libfltk_gl.1.1.dylib $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.1.1.dylib; \
+		$(LN) libfltk_gl.1.1.dylib $(DESTDIR)$(libdir)/libfltk_gl.dylib;\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\
-		$(RM) $(libdir)/libfltk_gl_s.a;\
-		$(CP) libfltk_gl_s.a $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk_gl.a; \
+		$(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\
+		$(CP) libfltk_gl_s.a $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.a; \
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\
-		$(RM) $(libdir)/libfltk_images.so*;\
-		$(CP) libfltk_images.so.1.1 $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk_images.so.1.1; \
-		$(LN) libfltk_images.so.1.1 $(libdir)/libfltk_images.so;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
+		$(CP) libfltk_images.so.1.1 $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.so.1.1; \
+		$(LN) libfltk_images.so.1.1 $(DESTDIR)$(libdir)/libfltk_images.so;\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\
-		$(RM) $(libdir)/libfltk_images.sl*;\
-		$(CP) libfltk_images.sl.1.1 $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk_images.sl.1.1; \
-		$(LN) libfltk_images.sl.1.1 $(libdir)/libfltk_images.sl;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\
+		$(CP) libfltk_images.sl.1.1 $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.sl.1.1; \
+		$(LN) libfltk_images.sl.1.1 $(DESTDIR)$(libdir)/libfltk_images.sl;\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images.1.1.dylib; then\
-		$(RM) $(libdir)/libfltk_images.*dylib;\
-		$(CP) libfltk_images.1.1.dylib $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk_images.1.1.dylib; \
-		$(LN) libfltk_images.1.1.dylib $(libdir)/libfltk_images.dylib;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\
+		$(CP) libfltk_images.1.1.dylib $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.1.1.dylib; \
+		$(LN) libfltk_images.1.1.dylib $(DESTDIR)$(libdir)/libfltk_images.dylib;\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\
-		$(RM) $(libdir)/libfltk_images_s.a;\
-		$(CP) libfltk_images_s.a $(libdir); \
-		$(CHMOD) 755 $(libdir)/libfltk_images.a; \
+		$(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\
+		$(CP) libfltk_images_s.a $(DESTDIR)$(libdir); \
+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.a; \
 	fi
 
 uninstall:
 	echo "Uninstalling libraries..."
-	$(RM) $(libdir)/$(LIBNAME)
+	$(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
 	if test x$(DSONAME) = xlibfltk.so.1.1; then\
-		$(RM) $(libdir)/libfltk.so*;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
 	fi
 	if test x$(DSONAME) = xlibfltk.sl.1.1; then\
-		$(RM) $(libdir)/libfltk.sl*;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
 	fi
 	if test x$(DSONAME) = xlibfltk.1.1.dylib; then\
-		$(RM) $(libdir)/libfltk.*dylib;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\
 	fi
 	if test x$(DSONAME) = xlibfltk_s.a; then\
-		$(RM) $(libdir)/libfltk_s.a;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
 	fi
-	$(RM) $(libdir)/$(FLLIBNAME);
+	$(RM) $(DESTDIR)$(libdir)/$(FLLIBNAME);
 	if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
-		$(RM) $(libdir)/libfltk_forms.so*;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
-		$(RM) $(libdir)/libfltk_forms.sl*;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms.1.1.dylib; then\
-		$(RM) $(libdir)/libfltk_forms.*dylib;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.*dylib;\
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\
-		$(RM) $(libdir)/libfltk_forms_s.a;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_forms_s.a;\
 	fi
 	if test x$(GLLIBNAME) != x; then\
-		$(RM) $(libdir)/$(GLLIBNAME);\
+		$(RM) $(DESTDIR)$(libdir)/$(GLLIBNAME);\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
-		$(RM) $(libdir)/libfltk_gl.so*;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
-		$(RM) $(libdir)/libfltk_gl.sl*;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.1.1.dylib; then\
-		$(RM) $(libdir)/libfltk_gl.*dylib;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\
-		$(RM) $(libdir)/libfltk_gl_s.a;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\
 	fi
 	if test x$(IMGLIBNAME) != x; then\
-		$(RM) $(libdir)/$(IMGLIBNAME);\
+		$(RM) $(DESTDIR)$(libdir)/$(IMGLIBNAME);\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\
-		$(RM) $(libdir)/libfltk_images.so*;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\
-		$(RM) $(libdir)/libfltk_images.sl*;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images.1.1.dylib; then\
-		$(RM) $(libdir)/libfltk_images.*dylib;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\
-		$(RM) $(libdir)/libfltk_images_s.a;\
+		$(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\
 	fi
 
 
 #
-# End of "$Id: Makefile,v 1.18.2.14.2.57 2004/07/23 19:26:26 easysw Exp $".
+# End of "$Id: Makefile,v 1.18.2.14.2.58 2004/10/18 20:22:25 easysw Exp $".
 #
diff --git a/src/fl_ask.cxx b/src/fl_ask.cxx
index 98e2bb5c7..121ffc742 100644
--- a/src/fl_ask.cxx
+++ b/src/fl_ask.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_ask.cxx,v 1.8.2.8.2.13 2004/04/11 04:38:59 easysw Exp $"
+// "$Id: fl_ask.cxx,v 1.8.2.8.2.14 2004/10/18 20:22:25 easysw Exp $"
 //
 // Standard dialog functions for the Fast Light Tool Kit (FLTK).
 //
@@ -316,6 +316,7 @@ static const char* input_innards(const char* fmt, va_list ap,
   input->type(type);
   input->show();
   input->value(defstr);
+  input->take_focus();
 
   int r = innards(fmt, ap, fl_cancel, fl_ok, 0);
   input->hide();
@@ -344,5 +345,5 @@ const char *fl_password(const char *fmt, const char *defstr, ...) {
 }
 
 //
-// End of "$Id: fl_ask.cxx,v 1.8.2.8.2.13 2004/04/11 04:38:59 easysw Exp $".
+// End of "$Id: fl_ask.cxx,v 1.8.2.8.2.14 2004/10/18 20:22:25 easysw Exp $".
 //