Fl_File_Chooser.H and fl_file_chooser.H need to be the same...

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

3 files changed, 6 insertions, 42 deletions

diff --git a/FL/Fl_File_Chooser.H b/FL/Fl_File_Chooser.H
index b04953e2f..6faa205f9 100644
--- a/FL/Fl_File_Chooser.H
+++ b/FL/Fl_File_Chooser.H
@@ -80,4 +80,7 @@ public:
   void value(const char *filename);
   int visible();
 };
+extern FL_EXPORT char *fl_dir_chooser(const char *message,const char *fname);
+extern FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const char *fname);
+extern FL_EXPORT void fl_file_chooser_callback(void (*cb)(const char*));
 #endif
diff --git a/FL/fl_file_chooser.H b/FL/fl_file_chooser.H
deleted file mode 100644
index 0a2183eed..000000000
--- a/FL/fl_file_chooser.H
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// "$Id: fl_file_chooser.H,v 1.5.2.3.2.3 2001/09/29 14:38:58 easysw Exp $"
-//
-// File chooser header file for the Fast Light Tool Kit (FLTK).
-//
-// Copyright 1998-2001 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".
-//
-
-#ifndef fl_file_chooser_H
-#define fl_file_chooser_H
-
-#include "Enumerations.H"
-
-FL_EXPORT char *fl_dir_chooser(const char *message,const char *fname);
-FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const char *fname);
-FL_EXPORT void fl_file_chooser_callback(void (*cb)(const char*));
-
-#endif
-
-//
-// End of "$Id: fl_file_chooser.H,v 1.5.2.3.2.3 2001/09/29 14:38:58 easysw Exp $".
-//
diff --git a/FL/forms.H b/FL/forms.H
index 4fac20518..5c26c4fd8 100644
--- a/FL/forms.H
+++ b/FL/forms.H
@@ -1,5 +1,5 @@
 //
-// "$Id: forms.H,v 1.7.2.7 2001/05/30 16:18:33 spitzak Exp $"
+// "$Id: forms.H,v 1.7.2.7.2.1 2001/09/30 17:37:06 easysw Exp $"
 //
 // Forms emulation header file for the Fast Light Tool Kit (FLTK).
 //
@@ -668,7 +668,7 @@ inline int fl_show_choices(const char* c,int n,const char* b1,const char* b2,
 }
 
 #include "filename.H"
-#include "fl_file_chooser.H"
+#include "Fl_File_Chooser.H"
 inline int do_matching(char* a, const char* b) {return filename_match(a,b);}
 
 // Forms-compatable file chooser (implementation in fselect.C):
@@ -838,5 +838,5 @@ inline void fl_draw() {Fl::flush();}
 #endif	/* define __FORMS_H__ */
 
 //
-// End of "$Id: forms.H,v 1.7.2.7 2001/05/30 16:18:33 spitzak Exp $".
+// End of "$Id: forms.H,v 1.7.2.7.2.1 2001/09/30 17:37:06 easysw Exp $".
 //