Author: matt Date: 2011-06-15 00:54:22 -0700 (Wed, 15 Jun 2011) New Revision: 8804 Log: Removed test1 for now.
Removed: branches/branch-3.0/test1/ Modified: branches/branch-3.0/FL/Fl_XBM_Image.H branches/branch-3.0/FL/Fl_XPM_Image.H branches/branch-3.0/FL/filename.H branches/branch-3.0/Makefile Modified: branches/branch-3.0/FL/Fl_XBM_Image.H =================================================================== --- branches/branch-3.0/FL/Fl_XBM_Image.H 2011-06-13 20:55:46 UTC (rev 8803) +++ branches/branch-3.0/FL/Fl_XBM_Image.H 2011-06-15 07:54:22 UTC (rev 8804) @@ -1,10 +1,10 @@ -#error header has not been ported to 3.0 yet // // "$Id$" // // XBM image header file for the Fast Light Tool Kit (FLTK). +// FLTK 123 wrapper finished // -// Copyright 1998-2010 by Bill Spitzak and others. +// Copyright 1998-2011 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 @@ -26,24 +26,27 @@ // http://www.fltk.org/str.php // -/* \file - Fl_XBM_Image class . */ - #ifndef Fl_XBM_Image_H #define Fl_XBM_Image_H -# include "Fl_Bitmap.H" -/** - The Fl_XBM_Image class supports loading, caching, - and drawing of X Bitmap (XBM) bitmap files. -*/ +#include <fltk3/XBMImage.h> +#include "Fl_Bitmap.H" + + class FL_EXPORT Fl_XBM_Image : public Fl_Bitmap { - public: +public: - Fl_XBM_Image(const char* filename); + Fl_XBM_Image() {} + + Fl_XBM_Image(const char* filename) { + _p = new fltk3::XBMImage(filename); + _p->wrapper(this); + } + }; + #endif // !Fl_XBM_Image_H // Modified: branches/branch-3.0/FL/Fl_XPM_Image.H =================================================================== --- branches/branch-3.0/FL/Fl_XPM_Image.H 2011-06-13 20:55:46 UTC (rev 8803) +++ branches/branch-3.0/FL/Fl_XPM_Image.H 2011-06-15 07:54:22 UTC (rev 8804) @@ -1,10 +1,10 @@ -#error header has not been ported to 3.0 yet // // "$Id$" // // XPM image header file for the Fast Light Tool Kit (FLTK). +// FLTK 123 wrapper finished // -// Copyright 1998-2010 by Bill Spitzak and others. +// Copyright 1998-2011 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 @@ -26,25 +26,27 @@ // http://www.fltk.org/str.php // -/* \file - - Fl_XPM_Image class . */ - #ifndef Fl_XPM_Image_H #define Fl_XPM_Image_H -# include "Fl_Pixmap.H" -/** - The Fl_XPM_Image class supports loading, caching, - and drawing of X Pixmap (XPM) images, including transparency. -*/ +#include <fltk3/XPMImage.h> +#include "Fl_Pixmap.H" + + class FL_EXPORT Fl_XPM_Image : public Fl_Pixmap { - public: +public: - Fl_XPM_Image(const char* filename); + Fl_XPM_Image() {} + + Fl_XPM_Image(const char* filename) { + _p = new fltk3::XPMImage(filename); + _p->wrapper(this); + } + }; + #endif // !Fl_XPM_Image // Modified: branches/branch-3.0/FL/filename.H =================================================================== --- branches/branch-3.0/FL/filename.H 2011-06-13 20:55:46 UTC (rev 8803) +++ branches/branch-3.0/FL/filename.H 2011-06-15 07:54:22 UTC (rev 8804) @@ -1,10 +1,10 @@ -#error header has not been ported to 3.0 yet /* * "$Id$" * * Filename header file for the Fast Light Tool Kit (FLTK). + * FLTK 123 wrapper started * - * Copyright 1998-2010 by Bill Spitzak and others. + * Copyright 1998-2011 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 @@ -35,58 +35,76 @@ #define FL_PATH_MAX 2048 -const char *fl_filename_name(const char * filename) { +inline const char *fl_filename_name(const char * filename) { return fltk3::filename_name(filename); } -FL_EXPORT const char *fl_filename_ext(const char *buf); -FL_EXPORT char *fl_filename_setext(char *to, int tolen, const char *ext); -FL_EXPORT int fl_filename_expand(char *to, int tolen, const char *from); -FL_EXPORT int fl_filename_absolute(char *to, int tolen, const char *from); -FL_EXPORT int fl_filename_relative(char *to, int tolen, const char *from); -FL_EXPORT int fl_filename_match(const char *name, const char *pattern); -FL_EXPORT int fl_filename_isdir(const char *name); +inline const char *fl_filename_ext(const char *buf) { + return fltk3::filename_ext(buf); +} -# if defined(__cplusplus) +inline char *fl_filename_setext(char *to, int tolen, const char *ext) { + return fltk3::filename_setext(to, tolen, ext); +} -inline char *fl_filename_setext(char *to, const char *ext) { return fl_filename_setext(to, FL_PATH_MAX, ext); } -inline int fl_filename_expand(char *to, const char *from) { return fl_filename_expand(to, FL_PATH_MAX, from); } -inline int fl_filename_absolute(char *to, const char *from) { return fl_filename_absolute(to, FL_PATH_MAX, from); } -FL_EXPORT int fl_filename_relative(char *to, int tolen, const char *from, const char *cwd); -inline int fl_filename_relative(char *to, const char *from) { return fl_filename_relative(to, FL_PATH_MAX, from); } +inline int fl_filename_expand(char *to, int tolen, const char *from) { + return fltk3::filename_expand(to, tolen, from); +} -# endif +inline int fl_filename_absolute(char *to, int tolen, const char *from) { + return fltk3::filename_absolute(to, tolen, from); +} +inline int fl_filename_relative(char *to, int tolen, const char *from) { + return fltk3::filename_relative(to, tolen, from); +} -# if defined(WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__) +inline int fl_filename_match(const char *name, const char *pattern) { + return fltk3::filename_match(name, pattern); +} -struct dirent {char d_name[1];}; +inline int fl_filename_isdir(const char *name) { + return fltk3::filename_isdir(name); +} -# elif defined(__WATCOMC__) -# include <sys/types.h> -# include <direct.h> +inline char *fl_filename_setext(char *to, const char *ext) { + return fltk3::filename_setext(to, FL_PATH_MAX, ext); +} -# else -# include <sys/types.h> -# define fl_dirent_h_cyclic_include -# include <dirent.h> -# undef fl_dirent_h_cyclic_include -# endif +inline int fl_filename_expand(char *to, const char *from) { + return fltk3::filename_expand(to, FL_PATH_MAX, from); +} -# if defined (__cplusplus) -extern "C" { -# endif /* __cplusplus */ +inline int fl_filename_absolute(char *to, const char *from) { + return fltk3::filename_absolute(to, FL_PATH_MAX, from); +} -FL_EXPORT int fl_alphasort(struct dirent **, struct dirent **); -FL_EXPORT int fl_casealphasort(struct dirent **, struct dirent **); -FL_EXPORT int fl_casenumericsort(struct dirent **, struct dirent **); -FL_EXPORT int fl_numericsort(struct dirent **, struct dirent **); +inline int fl_filename_relative(char *to, int tolen, const char *from, const char *cwd) { + return fltk3::filename_relative(to, tolen, from, cwd); +} - typedef int (Fl_File_Sort_F)(struct dirent **, struct dirent **); /**< File sorting function. \see fl_filename_list() */ +inline int fl_filename_relative(char *to, const char *from) { + return fltk3::filename_relative(to, FL_PATH_MAX, from); +} -# if defined(__cplusplus) +inline int fl_alphasort(struct dirent **a, struct dirent **b) { + return fltk3::alphasort(a, b); } +inline int fl_casealphasort(struct dirent **a, struct dirent **b) { + return fltk3::alphasort(a, b); +} + +inline int fl_casenumericsort(struct dirent **a, struct dirent **b) { + return fltk3::alphasort(a, b); +} + +inline int fl_numericsort(struct dirent **a, struct dirent **b) { + return fltk3::alphasort(a, b); +} + +typedef fltk3::FileSortF Fl_File_Sort_F; + FL_EXPORT int fl_filename_list(const char *d, struct dirent ***l, Fl_File_Sort_F *s = fl_numericsort); FL_EXPORT void fl_filename_free_list(struct dirent ***l, int n); Modified: branches/branch-3.0/Makefile =================================================================== --- branches/branch-3.0/Makefile 2011-06-13 20:55:46 UTC (rev 8803) +++ branches/branch-3.0/Makefile 2011-06-15 07:54:22 UTC (rev 8804) @@ -27,7 +27,7 @@ include makeinclude -DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation +DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test test1 documentation all: makeinclude fltk-config for dir in $(DIRS); do\ @@ -48,6 +48,7 @@ cd documentation; $(MAKE) $(MFLAGS) $(INSTALL_DESKTOP) cd fluid; $(MAKE) $(MFLAGS) $(INSTALL_DESKTOP) cd test; $(MAKE) $(MFLAGS) $(INSTALL_DESKTOP) + cd test1; $(MAKE) $(MFLAGS) $(INSTALL_DESKTOP) uninstall: makeinclude $(RM) $(DESTDIR)$(bindir)/fltk-config @@ -60,6 +61,7 @@ cd documentation; $(MAKE) $(MFLAGS) $(UNINSTALL_DESKTOP) cd fluid; $(MAKE) $(MFLAGS) $(UNINSTALL_DESKTOP) cd test; $(MAKE) $(MFLAGS) $(UNINSTALL_DESKTOP) + cd test1; $(MAKE) $(MFLAGS) $(UNINSTALL_DESKTOP) depend: makeinclude for dir in $(DIRS); do\ @@ -88,6 +90,10 @@ $(RM) test/`basename $$file .fl`.cxx; \ $(RM) test/`basename $$file .fl`.h; \ done + for file in test1/*.fl; do\ + $(RM) test1/`basename $$file .fl`.cxx; \ + $(RM) test1/`basename $$file .fl`.h; \ + done fltk-config: configure configh.in fltk-config.in if test -f config.status; then \ @@ -119,7 +125,7 @@ epm -v -f native fltk etags: - etags FL/*.H FL/*.h src/*.cxx src/*.c src/*.h src/xutf8/*.h src/xutf8/*.c cairo/*.cxx fluid/*.h fluid/*.cxx test/*.h test/*.cxx + etags FL/*.H FL/*.h src/*.cxx src/*.c src/*.h src/xutf8/*.h src/xutf8/*.c cairo/*.cxx fluid/*.h fluid/*.cxx test/*.h test/*.cxx test1/*.h test1/*.cxx # # Run the clang.llvm.org static code analysis tool on the C sources. _______________________________________________ fltk-commit mailing list [email protected] http://lists.easysw.com/mailman/listinfo/fltk-commit
