diff -ur -- fltk-1.1.6/FL/Enumerations.H fltk-utf8-1.1.6/FL/Enumerations.H --- fltk-1.1.6/FL/Enumerations.H 2004-11-20 03:19:57.000000000 +0000 +++ fltk-utf8-1.1.6/FL/Enumerations.H 2005-06-12 19:06:19.000000000 +0100 @@ -77,7 +77,8 @@ FL_DND_ENTER = 20, FL_DND_DRAG = 21, FL_DND_LEAVE = 22, - FL_DND_RELEASE = 23 + FL_DND_RELEASE = 23, + FL_DROP = 24 }; #define FL_KEYBOARD FL_KEYDOWN diff -ur -- fltk-1.1.6/FL/Fl.H fltk-utf8-1.1.6/FL/Fl.H --- fltk-1.1.6/FL/Fl.H 2004-11-23 19:47:50.000000000 +0000 +++ fltk-utf8-1.1.6/FL/Fl.H 2005-06-12 19:06:20.000000000 +0100 @@ -26,6 +26,7 @@ #ifndef Fl_H # define Fl_H +# include "fl_utf8.H" # include "Enumerations.H" # ifndef Fl_Object # define Fl_Object Fl_Widget @@ -73,6 +74,7 @@ static int compose_state; static int visible_focus_; static int dnd_text_ops_; + static int symbol_in_label_; static void damage(int d) {damage_ = d;} static void (*idle)(); @@ -252,6 +254,10 @@ static void dnd_text_ops(int v) { dnd_text_ops_ = v; } static int dnd_text_ops() { return dnd_text_ops_; } + // Symbols text operation methods... + static void symbol_in_label(int v) { symbol_in_label_ = v; } + static int symbol_in_label() { return symbol_in_label_; } + // Multithreading support: static void lock(); static void unlock(); @@ -261,6 +267,62 @@ // Widget deletion: static void delete_widget(Fl_Widget *w); static void do_widget_deletion(); + + // pointers you can use to change FLTK to a foreign language: + static const char* txt_ok; + static const char* txt_yes; + static const char* txt_no; + static const char* txt_cancel; + static const char* txt_close; + static const char* txt_choose_file; + static const char* txt_show; + static const char* txt_favorites; + static const char* txt_preview; + static const char* txt_file_name; + static const char* txt_manage_favorites; + static const char* txt_unable_to_load_icon; + static const char* txt_unable_to_open_fti; + static const char* txt_expected_letter_fti; + static const char* txt_expected_a_fti; + static const char* txt_expected_b_fti; + static const char* txt_expected_c_fti; + static const char* txt_unknown_command_fti; + static const char* txt_gif_unable_to_open; + static const char* txt_gif_is_not_gif; + static const char* txt_gif_is_version; + static const char* txt_gif_no_colormap; + static const char* txt_gif_unexpected_eof; + static const char* txt_gif_unknown_extension; + static const char* txt_gif_unknown_code; + static const char* txt_gif_lzw_barF; + static const char* txt_show_previous_help_page; + static const char* txt_make_the_help_text_smaller; + static const char* txt_make_the_help_text_larger; + static const char* txt_show_next_help_page; + static const char* txt_help_dialog; + static const char* txt_pnm_early_eof; + static const char* txt_ins1_failed; + static const char* txt_repl1_failed; + static const char* txt_cannot_modify_cb; + static const char* txt_cannot_find_pre; + static const char* txt_ptvl_failed; + static const char* txt_ovly1_failed; + static const char* txt_bad_measuremenT; + static const char* txt_error; + static const char* txt_unknown_color; + static const char* txt_xio_error; + static const char* txt_cannot_open_display; + static const char* txt_requires_true_color; + static const char* txt_cannot_do_scanline; + static const char* txt_cannot_bits_per_pixel; + static const char* txt_cannot_24bit; + static const char* txt_cannot_do_bits_per_pixel; + static const char* txt_cannot_create_pen; + static const char* txt_gif_lzw_barf; + static const char* txt_bad_measurement; + static const char* txt_at_search; + static const char* txt_find_text; + }; #endif // !Fl_H diff -ur -- fltk-1.1.6/FL/Fl_Group.H fltk-utf8-1.1.6/FL/Fl_Group.H --- fltk-1.1.6/FL/Fl_Group.H 2004-04-11 05:38:54.000000000 +0100 +++ fltk-utf8-1.1.6/FL/Fl_Group.H 2005-06-12 19:06:20.000000000 +0100 @@ -36,7 +36,7 @@ Fl_Widget* savedfocus_; Fl_Widget* resizable_; int children_; - short *sizes_; // remembered initial sizes of children + int *sizes_; // remembered initial sizes of children int navigation(int); static Fl_Group *current_; @@ -48,7 +48,7 @@ void draw_children(); void draw_outside_label(const Fl_Widget&) const ; void update_child(Fl_Widget&) const; - short* sizes(); + int* sizes(); public: diff -ur -- fltk-1.1.6/FL/Fl_Image.H fltk-utf8-1.1.6/FL/Fl_Image.H --- fltk-1.1.6/FL/Fl_Image.H 2004-04-11 05:38:54.000000000 +0100 +++ fltk-utf8-1.1.6/FL/Fl_Image.H 2005-06-12 19:06:20.000000000 +0100 @@ -73,6 +73,7 @@ virtual void draw(int X, int Y, int W, int H, int cx=0, int cy=0); void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);} virtual void uncache(); + virtual void to_rgba(uchar *buf) {; } }; class FL_EXPORT Fl_RGB_Image : public Fl_Image { @@ -101,6 +102,7 @@ virtual void label(Fl_Widget*w); virtual void label(Fl_Menu_Item*m); virtual void uncache(); + virtual void to_rgba(uchar *buf); }; #endif // !Fl_Image_H diff -ur -- fltk-1.1.6/FL/Fl_Pixmap.H fltk-utf8-1.1.6/FL/Fl_Pixmap.H --- fltk-1.1.6/FL/Fl_Pixmap.H 2004-04-11 05:38:54.000000000 +0100 +++ fltk-utf8-1.1.6/FL/Fl_Pixmap.H 2005-06-12 19:06:20.000000000 +0100 @@ -69,6 +69,7 @@ virtual void label(Fl_Widget*w); virtual void label(Fl_Menu_Item*m); virtual void uncache(); + virtual void to_rgba(uchar *buf); }; #endif Only in fltk-utf8-1.1.6/FL: Fl_Shaped_Window.H Only in fltk-utf8-1.1.6/FL: Fl_Table.H diff -ur -- fltk-1.1.6/FL/Fl_Tabs.H fltk-utf8-1.1.6/FL/Fl_Tabs.H --- fltk-1.1.6/FL/Fl_Tabs.H 2004-04-11 05:38:54.000000000 +0100 +++ fltk-utf8-1.1.6/FL/Fl_Tabs.H 2005-06-12 19:06:20.000000000 +0100 @@ -32,7 +32,7 @@ Fl_Widget *value_; Fl_Widget *push_; int tab_positions(int*, int*); - int tab_height(); + int tab_height_; void draw_tab(int x1, int x2, int W, int H, Fl_Widget* o, int sel=0); protected: void draw(); @@ -45,6 +45,8 @@ int push(Fl_Widget *); Fl_Tabs(int,int,int,int,const char * = 0); Fl_Widget *which(int event_x, int event_y); + int tab_height(); + void tab_height(int h); }; #endif Only in fltk-utf8-1.1.6/FL: Fl_Tree.H diff -ur -- fltk-1.1.6/FL/Fl_Widget.H fltk-utf8-1.1.6/FL/Fl_Widget.H --- fltk-1.1.6/FL/Fl_Widget.H 2004-11-23 19:47:50.000000000 +0000 +++ fltk-utf8-1.1.6/FL/Fl_Widget.H 2005-06-12 19:06:21.000000000 +0100 @@ -56,7 +56,7 @@ Fl_Group* parent_; Fl_Callback* callback_; void* user_data_; - short x_,y_,w_,h_; + int x_,y_,w_,h_; Fl_Label label_; int flags_; unsigned color_; @@ -81,10 +81,10 @@ Fl_Widget(int,int,int,int,const char* =0); - void x(int v) {x_ = (short)v;} - void y(int v) {y_ = (short)v;} - void w(int v) {w_ = (short)v;} - void h(int v) {h_ = (short)v;} + void x(int v) {x_ = v;} + void y(int v) {y_ = v;} + void w(int v) {w_ = v;} + void h(int v) {h_ = v;} int flags() const {return flags_;} void set_flag(int c) {flags_ |= c;} Only in fltk-utf8-1.1.6/FL: Xutf8.h diff -ur -- fltk-1.1.6/FL/fl_ask.H fltk-utf8-1.1.6/FL/fl_ask.H --- fltk-1.1.6/FL/fl_ask.H 2004-04-11 05:38:54.000000000 +0100 +++ fltk-utf8-1.1.6/FL/fl_ask.H 2005-06-12 19:06:19.000000000 +0100 @@ -53,13 +53,6 @@ inline void fl_message_font(unsigned char f,unsigned char s) { fl_message_font_ = (Fl_Font)f; fl_message_size_ = s;} -// pointers you can use to change FLTK to a foreign language: -extern FL_EXPORT const char* fl_no; -extern FL_EXPORT const char* fl_yes; -extern FL_EXPORT const char* fl_ok; -extern FL_EXPORT const char* fl_cancel; -extern FL_EXPORT const char* fl_close; - #endif // diff -ur -- fltk-1.1.6/FL/fl_draw.H fltk-utf8-1.1.6/FL/fl_draw.H --- fltk-1.1.6/FL/fl_draw.H 2004-04-11 05:38:54.000000000 +0100 +++ fltk-utf8-1.1.6/FL/fl_draw.H 2005-06-12 19:06:19.000000000 +0100 @@ -146,11 +146,12 @@ FL_EXPORT int fl_descent(); FL_EXPORT double fl_width(const char*); FL_EXPORT double fl_width(const char*, int n); -FL_EXPORT double fl_width(uchar); +FL_EXPORT double fl_width(unsigned int); // draw using current font: FL_EXPORT void fl_draw(const char*, int x, int y); FL_EXPORT void fl_draw(const char*, int n, int x, int y); +FL_EXPORT void fl_rtl_draw(const char*, int n, int x, int y); FL_EXPORT void fl_measure(const char*, int& x, int& y, int draw_symbols = 1); FL_EXPORT void fl_draw(const char*, int,int,int,int, Fl_Align, Fl_Image* img=0, int draw_symbols = 1); @@ -172,6 +173,7 @@ FL_EXPORT void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b); FL_EXPORT uchar *fl_read_image(uchar *p, int x,int y, int w, int h, int alpha=0); +FL_EXPORT int fl_rgba_pixmap(const char* const* data, Fl_Color c, uchar* buf); // pixmaps: FL_EXPORT int fl_draw_pixmap(/*const*/ char* const* data, int x,int y,Fl_Color=FL_GRAY); @@ -186,6 +188,16 @@ FL_EXPORT void fl_overlay_rect(int,int,int,int); FL_EXPORT void fl_overlay_clear(); FL_EXPORT void fl_cursor(Fl_Cursor, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE); +FL_EXPORT const char* fl_expand_text(const char* from, char* buf, int maxbuf, + double maxw, int& n, double &width, + int wrap, int draw_symbols = 0); + +// XIM: +FL_EXPORT void fl_set_status(int X, int Y, int W, int H); +FL_EXPORT void fl_set_spot(int font, int size, int x, int y, int w, int h); +FL_EXPORT void fl_reset_spot(void); + + // XForms symbols: FL_EXPORT int fl_draw_symbol(const char* label,int x,int y,int w,int h, Fl_Color); Only in fltk-utf8-1.1.6/FL: fl_utf8.H diff -ur -- fltk-1.1.6/FL/math.h fltk-utf8-1.1.6/FL/math.h --- fltk-1.1.6/FL/math.h 2004-04-11 05:38:55.000000000 +0100 +++ fltk-utf8-1.1.6/FL/math.h 2005-06-12 19:06:21.000000000 +0100 @@ -56,10 +56,8 @@ # endif // !M_SQRT2 # if (defined(WIN32) || defined(CRAY)) && !defined(__MINGW32__) && !defined(__MWERKS__) - inline double rint(double v) {return floor(v+.5);} inline double copysign(double a, double b) {return b<0 ? -a : a;} - # endif // (WIN32 || CRAY) && !__MINGW32__ && !__MWERKS__ #endif // !fl_math_h diff -ur -- fltk-1.1.6/FL/x.H fltk-utf8-1.1.6/FL/x.H --- fltk-1.1.6/FL/x.H 2004-04-11 05:38:55.000000000 +0100 +++ fltk-utf8-1.1.6/FL/x.H 2005-06-12 19:06:21.000000000 +0100 @@ -48,7 +48,7 @@ # endif # include # include "Fl_Window.H" - +# include "Xutf8.h" // Mirror X definition of Region to Fl_Region, for portability... typedef Region Fl_Region; @@ -66,7 +66,7 @@ // drawing functions: extern FL_EXPORT GC fl_gc; extern FL_EXPORT Window fl_window; -extern FL_EXPORT XFontStruct* fl_xfont; +extern FL_EXPORT XUtf8FontStruct* fl_xfont; FL_EXPORT ulong fl_xpixel(Fl_Color i); FL_EXPORT ulong fl_xpixel(uchar r, uchar g, uchar b); FL_EXPORT void fl_clip_region(Fl_Region); Only in fltk-utf8-1.1.6/: MODIFIED.utf8 diff -ur -- fltk-1.1.6/Makefile fltk-utf8-1.1.6/Makefile --- fltk-1.1.6/Makefile 2004-10-18 21:22:21.000000000 +0100 +++ fltk-utf8-1.1.6/Makefile 2005-06-12 19:06:25.000000000 +0100 @@ -20,12 +20,12 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. # -# Please report all bugs and problems to "fltk-bugs@fltk.org". +# Please report all bugs and problems to "fltk-utf8-bugs@fltk-utf8.org". # include makeinclude -DIRS = $(IMAGEDIRS) src fluid test documentation +DIRS = xutf8 $(IMAGEDIRS) src fluid test documentation all: makeinclude for dir in $(DIRS); do\ @@ -35,16 +35,16 @@ install: makeinclude -mkdir -p $(DESTDIR)$(bindir) - $(RM) $(DESTDIR)$(bindir)/fltk-config - -cp fltk-config $(DESTDIR)$(bindir) - -chmod 755 $(DESTDIR)$(bindir)/fltk-config + $(RM) $(DESTDIR)$(bindir)/fltk-utf8-config + -cp fltk-utf8-config $(DESTDIR)$(bindir) + -chmod 755 $(DESTDIR)$(bindir)/fltk-utf8-config for dir in FL $(DIRS); do\ echo "=== installing $$dir ===";\ (cd $$dir; $(MAKE) $(MFLAGS) install) || break;\ done uninstall: makeinclude - $(RM) $(DESTDIR)$(bindir)/fltk-config + $(RM) $(DESTDIR)$(bindir)/fltk-utf8-config for dir in FL $(DIRS); do\ echo "=== uninstalling $$dir ===";\ (cd $$dir; $(MAKE) $(MFLAGS) uninstall) || break;\ @@ -65,13 +65,13 @@ distclean: clean $(RM) config.* - $(RM) fltk-config fltk.list makeinclude + $(RM) fltk-utf8-config fltk-utf8.list makeinclude $(RM) FL/Makefile $(RM) documentation/*.$(CAT1EXT) $(RM) documentation/*.$(CAT3EXT) - $(RM) documentation/fltk.pdf - $(RM) documentation/fltk.ps - $(RM) -r documentation/fltk.d + $(RM) documentation/fltk-utf8.pdf + $(RM) documentation/fltk-utf8.ps + $(RM) -r documentation/fltk-utf8.d for file in test/*.fl; do\ $(RM) test/`basename $file .fl`.cxx; \ $(RM) test/`basename $file .fl`.h; \ @@ -90,10 +90,10 @@ autoconf portable-dist: - epm -v -s fltk.xpm fltk + epm -v -s fltk-utf8.xpm fltk-utf8 native-dist: - epm -v -f native fltk + epm -v -f native fltk-utf8 # Only in fltk-utf8-1.1.6/: autom4te.cache diff -ur -- fltk-1.1.6/configh.in fltk-utf8-1.1.6/configh.in --- fltk-1.1.6/configh.in 2004-08-25 01:20:24.000000000 +0100 +++ fltk-utf8-1.1.6/configh.in 2005-06-12 19:06:16.000000000 +0100 @@ -232,6 +232,11 @@ #undef HAVE_PTHREAD #undef HAVE_PTHREAD_H +/* + * Do we have iconv? + */ + +#undef HAVE_LIBC_ICONV /* * End of "$Id: configh.in,v 1.11.2.11.2.18 2004/08/25 00:20:24 matthiaswm Exp $". diff -ur -- fltk-1.1.6/configure fltk-utf8-1.1.6/configure --- fltk-1.1.6/configure 2004-11-23 20:35:43.000000000 +0000 +++ fltk-utf8-1.1.6/configure 2005-06-28 16:07:48.000000000 +0100 @@ -1,9 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57. +# Generated by GNU Autoconf 2.59. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -20,9 +19,10 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -41,7 +41,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -218,16 +218,17 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -308,7 +309,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS FL_MAJOR_VERSION FL_MINOR_VERSION FL_PATCH_VERSION FL_RELEASE_VERSION FL_API_VERSION OPTIM FLLIBNAME GLDEMOS GLLIBNAME IMGLIBNAME LIBEXT LIBNAME LINKFLTK LINKFLTKGL LINKFLTKIMG DSOCOMMAND DSOLINK DSONAME FLDSONAME GLDSONAME IMGDSONAME SHAREDSUFFIX LINKSHARED FLUID CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX NROFF GROFF HTMLDOC RANLIB ac_ct_RANLIB AR LIBCOMMAND CPP EGREP IMAGELIBS JPEG JPEGINC PNG PNGINC ZLIB ZLIBINC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS FTCONFIG GLLIB HLINKS POSTBUILD THREADS CAT1EXT CAT3EXT MAKEDEPEND LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS FL_MAJOR_VERSION FL_MINOR_VERSION FL_PATCH_VERSION FL_RELEASE_VERSION FL_API_VERSION OPTIM FLLIBNAME GLDEMOS GLLIBNAME IMGLIBNAME LIBEXT LIBNAME LINKFLTK LINKFLTKGL LINKFLTKIMG DSOCOMMAND DSOLINK DSONAME XDSONAME FLDSONAME GLDSONAME IMGDSONAME SHAREDSUFFIX LINKSHARED FLUID CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX NROFF GROFF HTMLDOC RANLIB ac_ct_RANLIB AR LIBCOMMAND CPP EGREP HAVE_LIBC_ICONV IMAGELIBS JPEG JPEGINC PNG PNGINC ZLIB ZLIBINC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS FTCONFIG GLLIB HLINKS POSTBUILD THREADS CAT1EXT CAT3EXT MAKEDEPEND LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -667,7 +668,7 @@ # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -707,10 +708,10 @@ # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -810,9 +811,9 @@ cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -917,12 +918,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. @@ -933,7 +967,7 @@ echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else @@ -947,8 +981,7 @@ if $ac_init_version; then cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -960,7 +993,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1037,19 +1070,19 @@ 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. @@ -1083,12 +1116,12 @@ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } @@ -1117,7 +1150,7 @@ for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1136,7 +1169,7 @@ echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core core.* *.core && + rm -f core *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 @@ -1216,7 +1249,7 @@ # value. ac_cache_corrupted=false for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" @@ -1233,13 +1266,13 @@ ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -1334,16 +1367,16 @@ ;; esac -LINKFLTK="-lfltk" -LINKFLTKGL="-lfltk_gl" -LINKFLTKIMG="-lfltk_images" +LINKFLTK="-lfltk-utf8 -lfltk_xutf8" +LINKFLTKGL="-lfltk-utf8_gl" +LINKFLTKIMG="-lfltk-utf8_images" GLDEMOS="gldemos" LIBEXT=".a" -LIBNAME="../lib/libfltk.a" -FLLIBNAME="../lib/libfltk_forms.a" -GLLIBNAME="../lib/libfltk_gl.a" -IMGLIBNAME="../lib/libfltk_images.a" +LIBNAME="../lib/libfltk-utf8.a" +FLLIBNAME="../lib/libfltk-utf8_forms.a" +GLLIBNAME="../lib/libfltk-utf8_gl.a" +IMGLIBNAME="../lib/libfltk-utf8_images.a" @@ -1384,68 +1417,75 @@ case $uname in Darwin*) - DSONAME="libfltk.$FL_API_VERSION.dylib" - FLDSONAME="libfltk_forms.$FL_API_VERSION.dylib" - GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib" - IMGDSONAME="libfltk_images.$FL_API_VERSION.dylib" + DSONAME="libfltk-utf8.$FL_API_VERSION.dylib" + XDSONAME="libfltk_xutf8.$FL_API_VERSION.dylib" + FLDSONAME="libfltk-utf8_forms.$FL_API_VERSION.dylib" + GLDSONAME="libfltk-utf8_gl.$FL_API_VERSION.dylib" + IMGDSONAME="libfltk-utf8_images.$FL_API_VERSION.dylib" DSOCOMMAND="\$(CC) $DSOFLAGS -dynamiclib -lc -o" ;; SunOS* | UNIX_S*) - DSONAME="libfltk.so.$FL_API_VERSION" - FLDSONAME="libfltk_forms.so.$FL_API_VERSION" - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" + DSONAME="libfltk-utf8.so.$FL_API_VERSION" + XDSONAME="libfltk_xutf8.so.$FL_API_VERSION" + FLDSONAME="libfltk-utf8_forms.so.$FL_API_VERSION" + GLDSONAME="libfltk-utf8_gl.so.$FL_API_VERSION" + IMGDSONAME="libfltk-utf8_images.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) -h \$@ \$(LDLIBS) -G $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib"; then DSOLINK="-R$libdir" fi ;; HP-UX*) - DSONAME="libfltk.sl.$FL_API_VERSION" - FLDSONAME="libfltk_forms.sl.$FL_API_VERSION" - GLDSONAME="libfltk_gl.sl.$FL_API_VERSION" - IMGDSONAME="libfltk_images.sl.$FL_API_VERSION" + DSONAME="libfltk-utf8.sl.$FL_API_VERSION" + XDSONAME="libfltk_xutf8.sl.$FL_API_VERSION" + FLDSONAME="libfltk-utf8_forms.sl.$FL_API_VERSION" + GLDSONAME="libfltk-utf8_gl.sl.$FL_API_VERSION" + IMGDSONAME="libfltk-utf8_images.sl.$FL_API_VERSION" DSOCOMMAND="ld -b -z +h \$@ $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib"; then DSOLINK="-Wl,-rpath,$libdir" fi ;; IRIX*) - DSONAME="libfltk.so.$FL_API_VERSION" - FLDSONAME="libfltk_forms.so.$FL_API_VERSION" - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" + DSONAME="libfltk-utf8.so.$FL_API_VERSION" + XDSONAME="libfltk_xutf8.so.$FL_API_VERSION" + FLDSONAME="libfltk-utf8_forms.so.$FL_API_VERSION" + GLDSONAME="libfltk-utf8_gl.so.$FL_API_VERSION" + IMGDSONAME="libfltk-utf8_images.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) -Wl,-soname,\$@,-set_version,sgi1.1 \$(LDLIBS) -shared $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32" -a "x$libdir" != "x/usr/lib64"; then DSOLINK="-Wl,-rpath,$libdir" fi ;; OSF1*) - DSONAME="libfltk.so.$FL_API_VERSION" - FLDSONAME="libfltk_forms.so.$FL_API_VERSION" - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" + DSONAME="libfltk-utf8.so.$FL_API_VERSION" + XDSONAME="libfltk_xutf8.so.$FL_API_VERSION" + FLDSONAME="libfltk-utf8_forms.so.$FL_API_VERSION" + GLDSONAME="libfltk-utf8_gl.so.$FL_API_VERSION" + IMGDSONAME="libfltk-utf8_images.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32"; then DSOLINK="-Wl,-rpath,$libdir" fi ;; Linux* | *BSD*) - DSONAME="libfltk.so.$FL_API_VERSION" - FLDSONAME="libfltk_forms.so.$FL_API_VERSION" - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" + DSONAME="libfltk-utf8.so.$FL_API_VERSION" + XDSONAME="libfltk_xutf8.so.$FL_API_VERSION" + FLDSONAME="libfltk-utf8_forms.so.$FL_API_VERSION" + GLDSONAME="libfltk-utf8_gl.so.$FL_API_VERSION" + IMGDSONAME="libfltk-utf8_images.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib"; then DSOLINK="-Wl,-rpath,$libdir" fi ;; AIX*) - DSONAME="libfltk_s.a" - FLDSONAME="libfltk_forms_s.a" - GLDSONAME="libfltk_gl_s.a" - IMGDSONAME="libfltk_images_s.a" + DSONAME="libfltk-utf8_s.a" + XDSONAME="libfltk_xutf8_s.a" + FLDSONAME="libfltk-utf8_forms_s.a" + GLDSONAME="libfltk-utf8_gl_s.a" + IMGDSONAME="libfltk-utf8_images_s.a" DSOCOMMAND="\$(CXX) -Wl,-bexpall,-bM:SRE,-bnoentry -o" SHAREDSUFFIX="_s" ;; @@ -1456,15 +1496,16 @@ *) { echo "$as_me:$LINENO: WARNING: Shared libraries may not be supported. Trying -shared option with compiler." >&5 echo "$as_me: WARNING: Shared libraries may not be supported. Trying -shared option with compiler." >&2;} - DSONAME="libfltk.so.$FL_API_VERSION" - FLDSONAME="libfltk_forms.so.$FL_API_VERSION" - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" + DSONAME="libfltk-utf8.so.$FL_API_VERSION" + XDSONAME="libfltk_xutf8.so.$FL_API_VERSION" + FLDSONAME="libfltk-utf8_forms.so.$FL_API_VERSION" + GLDSONAME="libfltk-utf8_gl.so.$FL_API_VERSION" + IMGDSONAME="libfltk-utf8_images.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o" ;; esac - LINKSHARED="-L../src -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX" + LINKSHARED="-L../src -L../xutf8 -lfltk-utf8_images$SHAREDSUFFIX -lfltk-utf8_forms$SHAREDSUFFIX -lfltk-utf8$SHAREDSUFFIX -lfltk_xutf8$SHAREDSUFFIX" else DSOCOMMAND="echo" DSOLINK="" @@ -1475,7 +1516,7 @@ PICFLAG=0 SHAREDSUFFIX="" FLUID="fluid" - LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk" + LINKSHARED="-L../lib -lfltk-utf8_images -lfltk-utf8_forms -lfltk-utf8 -lfltk_xutf8" fi @@ -1488,6 +1529,7 @@ + # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then enableval="$enable_threads" @@ -1862,7 +1904,6 @@ (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1882,8 +1923,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C compiler default output" >&5 -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 @@ -1903,23 +1944,23 @@ test -f "$ac_file" || continue case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; + ;; conftest.$ac_ext ) - # This is the source file. - ;; + # This is the source file. + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; * ) - break;; + break;; esac done else @@ -1993,8 +2034,8 @@ case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; + export ac_cv_exeext + break;; * ) break;; esac done @@ -2019,7 +2060,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2070,7 +2110,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2090,11 +2129,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2107,7 +2156,7 @@ ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -2123,7 +2172,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2140,11 +2188,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2157,7 +2215,7 @@ ac_cv_prog_cc_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 @@ -2184,7 +2242,6 @@ ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2212,6 +2269,16 @@ va_end (v); return s; } + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std1 is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std1. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -2238,11 +2305,21 @@ CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2255,7 +2332,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext +rm -f conftest.err conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC @@ -2283,19 +2360,28 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ - ''\ - '#include ' \ + '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2303,14 +2389,13 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -2321,11 +2406,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2338,9 +2433,8 @@ continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2357,11 +2451,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2373,7 +2477,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2387,7 +2491,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2513,7 +2617,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2533,11 +2636,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2550,7 +2663,7 @@ ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi @@ -2566,7 +2679,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2583,11 +2695,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2600,7 +2722,7 @@ ac_cv_prog_cxx_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 @@ -2620,8 +2742,7 @@ fi fi for ac_declaration in \ - ''\ - '#include ' \ + '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2629,14 +2750,13 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -2647,11 +2767,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2664,9 +2794,8 @@ continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2683,11 +2812,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2699,7 +2838,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2981,7 +3120,6 @@ else # See if sys/param.h defines the BYTE_ORDER macro. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3003,11 +3141,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3015,7 +3163,6 @@ (exit $ac_status); }; }; then # It does; now see whether it defined to BIG_ENDIAN or not. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3037,11 +3184,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3054,7 +3211,7 @@ ac_cv_c_bigendian=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3064,7 +3221,6 @@ # try to guess the endianness by grepping values into an object file ac_cv_c_bigendian=unknown cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3086,11 +3242,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3112,10 +3278,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3154,10 +3319,10 @@ ( exit $ac_status ) ac_cv_c_bigendian=yes fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 echo "${ECHO_T}$ac_cv_c_bigendian" >&6 @@ -3207,7 +3372,6 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3218,7 +3382,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -3230,6 +3394,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -3250,7 +3415,6 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3268,6 +3432,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -3314,7 +3479,6 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3325,7 +3489,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -3337,6 +3501,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -3357,7 +3522,6 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3375,6 +3539,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -3435,7 +3600,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3456,11 +3620,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3473,12 +3647,11 @@ ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3500,7 +3673,6 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3525,7 +3697,6 @@ : else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3537,9 +3708,9 @@ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -3550,7 +3721,7 @@ int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -3575,7 +3746,7 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -3600,7 +3771,7 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -3609,7 +3780,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3621,11 +3791,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3638,7 +3818,7 @@ eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -3658,7 +3838,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3678,11 +3857,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3695,7 +3884,7 @@ ac_cv_type_short=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 echo "${ECHO_T}$ac_cv_type_short" >&6 @@ -3713,7 +3902,6 @@ if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3732,11 +3920,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3745,7 +3943,6 @@ ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3764,11 +3961,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3780,20 +3987,19 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3812,11 +4018,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3825,7 +4041,6 @@ ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3844,11 +4059,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3860,13 +4085,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 @@ -3874,14 +4099,13 @@ ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3900,11 +4124,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3917,7 +4151,7 @@ ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_short=$ac_lo;; @@ -3936,7 +4170,6 @@ { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3998,7 +4231,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val @@ -4019,7 +4252,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4039,11 +4271,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4056,7 +4298,7 @@ ac_cv_type_int=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 echo "${ECHO_T}$ac_cv_type_int" >&6 @@ -4074,7 +4316,6 @@ if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4093,11 +4334,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4106,7 +4357,6 @@ ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4125,11 +4375,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4141,20 +4401,19 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4173,11 +4432,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4186,7 +4455,6 @@ ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4205,11 +4473,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4221,13 +4499,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 @@ -4235,14 +4513,13 @@ ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4261,11 +4538,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4278,7 +4565,7 @@ ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_int=$ac_lo;; @@ -4297,7 +4584,6 @@ { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4359,7 +4645,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val @@ -4380,7 +4666,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4400,11 +4685,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4417,7 +4712,7 @@ ac_cv_type_long=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 echo "${ECHO_T}$ac_cv_type_long" >&6 @@ -4435,7 +4730,6 @@ if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4454,11 +4748,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4467,7 +4771,6 @@ ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4486,11 +4789,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4502,20 +4815,19 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4534,11 +4846,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4547,7 +4869,6 @@ ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4566,11 +4887,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4582,13 +4913,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 @@ -4596,14 +4927,13 @@ ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4622,11 +4952,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4639,7 +4979,7 @@ ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long=$ac_lo;; @@ -4658,7 +4998,6 @@ { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4720,7 +5059,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val @@ -4784,7 +5123,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4808,11 +5146,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4825,7 +5173,7 @@ ac_cv_cxx_bool=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4855,7 +5203,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4875,11 +5222,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4892,7 +5249,7 @@ eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -4915,7 +5272,6 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4939,11 +5295,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4955,12 +5321,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_opendir" = no; then for ac_lib in dir; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4984,11 +5350,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5001,7 +5377,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext done fi LIBS=$ac_func_search_save_LIBS @@ -5022,7 +5399,6 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5046,11 +5422,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5062,12 +5448,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_opendir" = no; then for ac_lib in x; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5091,11 +5477,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5108,7 +5504,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext done fi LIBS=$ac_func_search_save_LIBS @@ -5135,7 +5532,6 @@ echo "$as_me:$LINENO: checking sys/select.h usability" >&5 echo $ECHO_N "checking sys/select.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5146,11 +5542,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5163,7 +5569,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -5171,7 +5577,6 @@ echo "$as_me:$LINENO: checking sys/select.h presence" >&5 echo $ECHO_N "checking sys/select.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5189,6 +5594,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -5208,33 +5614,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: sys/select.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: sys/select.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/select.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/select.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: sys/select.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sys/select.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: sys/select.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: sys/select.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/select.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/select.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/select.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sys/select.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/select.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sys/select.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/select.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sys/select.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: sys/select.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: sys/select.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/select.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sys/select.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -5272,7 +5677,6 @@ echo "$as_me:$LINENO: checking sys/stdtypes.h usability" >&5 echo $ECHO_N "checking sys/stdtypes.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5283,11 +5687,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5300,7 +5714,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -5308,7 +5722,6 @@ echo "$as_me:$LINENO: checking sys/stdtypes.h presence" >&5 echo $ECHO_N "checking sys/stdtypes.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5326,6 +5739,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -5345,33 +5759,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: sys/stdtypes.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: sys/stdtypes.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/stdtypes.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/stdtypes.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: sys/stdtypes.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sys/stdtypes.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: sys/stdtypes.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: sys/stdtypes.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/stdtypes.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/stdtypes.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/stdtypes.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sys/stdtypes.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/stdtypes.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sys/stdtypes.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/stdtypes.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sys/stdtypes.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: sys/stdtypes.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: sys/stdtypes.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/stdtypes.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sys/stdtypes.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -5402,21 +5815,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define scandir to an innocuous variant, in case declares scandir. + For example, HP-UX 11i declares gettimeofday. */ +#define scandir innocuous_scandir + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char scandir (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef scandir + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -5447,11 +5867,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5464,7 +5894,8 @@ ac_cv_func_scandir=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_scandir" >&5 echo "${ECHO_T}$ac_cv_func_scandir" >&6 @@ -5486,21 +5917,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define vsnprintf to an innocuous variant, in case declares vsnprintf. + For example, HP-UX 11i declares gettimeofday. */ +#define vsnprintf innocuous_vsnprintf + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vsnprintf (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef vsnprintf + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -5531,11 +5969,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5548,7 +5996,8 @@ ac_cv_func_vsnprintf=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_vsnprintf" >&5 echo "${ECHO_T}$ac_cv_func_vsnprintf" >&6 @@ -5594,21 +6043,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define snprintf to an innocuous variant, in case declares snprintf. + For example, HP-UX 11i declares gettimeofday. */ +#define snprintf innocuous_snprintf + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char snprintf (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef snprintf + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -5639,11 +6095,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5656,7 +6122,8 @@ ac_cv_func_snprintf=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_snprintf" >&5 echo "${ECHO_T}$ac_cv_func_snprintf" >&6 @@ -5709,7 +6176,6 @@ echo "$as_me:$LINENO: checking strings.h usability" >&5 echo $ECHO_N "checking strings.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5720,11 +6186,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5737,7 +6213,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -5745,7 +6221,6 @@ echo "$as_me:$LINENO: checking strings.h presence" >&5 echo $ECHO_N "checking strings.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5763,6 +6238,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -5782,33 +6258,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: strings.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: strings.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: strings.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: strings.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: strings.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: strings.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: strings.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: strings.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: strings.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: strings.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: strings.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: strings.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: strings.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: strings.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: strings.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: strings.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: strings.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: strings.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: strings.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: strings.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -5845,21 +6320,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -5890,11 +6372,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5907,7 +6399,8 @@ eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -5928,7 +6421,6 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_pow=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5952,11 +6444,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5968,12 +6470,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_pow" = no; then for ac_lib in m; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5997,11 +6499,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6014,7 +6526,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext done fi LIBS=$ac_func_search_save_LIBS @@ -6027,6 +6540,82 @@ fi +HAVE_LIBC_ICONV=0 +echo "$as_me:$LINENO: checking for iconv in -lc" >&5 +echo $ECHO_N "checking for iconv in -lc... $ECHO_C" >&6 +if test "${ac_cv_lib_c_iconv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lc $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char iconv (); +int +main () +{ +iconv (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_c_iconv=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_c_iconv=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_c_iconv" >&5 +echo "${ECHO_T}$ac_cv_lib_c_iconv" >&6 +if test $ac_cv_lib_c_iconv = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBC_ICONV 1 +_ACEOF + + HAVE_LIBC_ICONV=1 + +fi + + + SAVELIBS="$LIBS" IMAGELIBS="" @@ -6048,7 +6637,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6072,11 +6660,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6089,7 +6687,8 @@ ac_cv_lib_jpeg_jpeg_CreateCompress=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_CreateCompress" >&5 @@ -6113,7 +6712,7 @@ JPEGINC="-I../jpeg" JPEG="jpeg" - IMAGELIBS="-lfltk_jpeg $IMAGELIBS" + IMAGELIBS="-lfltk-utf8_jpeg $IMAGELIBS" fi fi @@ -6134,7 +6733,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6158,11 +6756,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6175,7 +6783,8 @@ ac_cv_lib_z_gzgets=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5 @@ -6200,8 +6809,8 @@ ZLIBINC="-I../zlib" ZLIB="zlib" - LIBS="-lfltk_z $LIBS" - IMAGELIBS="-lfltk_z $IMAGELIBS" + LIBS="-lfltk-utf8_z $LIBS" + IMAGELIBS="-lfltk-utf8_z $IMAGELIBS" fi fi @@ -6222,7 +6831,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lpng $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6246,11 +6854,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6263,7 +6881,8 @@ ac_cv_lib_png_png_set_tRNS_to_alpha=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_tRNS_to_alpha" >&5 @@ -6290,7 +6909,6 @@ echo "$as_me:$LINENO: checking png.h usability" >&5 echo $ECHO_N "checking png.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6301,11 +6919,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6318,7 +6946,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -6326,7 +6954,6 @@ echo "$as_me:$LINENO: checking png.h presence" >&5 echo $ECHO_N "checking png.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6344,6 +6971,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -6363,33 +6991,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -6430,7 +7057,7 @@ PNGINC="-I../png" PNG="png" - IMAGELIBS="-lfltk_png $IMAGELIBS" + IMAGELIBS="-lfltk-utf8_png $IMAGELIBS" fi fi @@ -6462,7 +7089,6 @@ echo "$as_me:$LINENO: checking pthread.h usability" >&5 echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6473,11 +7099,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6490,7 +7126,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -6498,7 +7134,6 @@ echo "$as_me:$LINENO: checking pthread.h presence" >&5 echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6516,6 +7151,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -6535,33 +7171,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -6595,7 +7230,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6619,11 +7253,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6636,7 +7280,8 @@ ac_cv_lib_pthread_pthread_create=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 @@ -6659,7 +7304,6 @@ SAVELIBS="$LIBS" LIBS="-pthread $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6676,11 +7320,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6694,7 +7348,8 @@ LIBS="$SAVELIBS" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext echo "$as_me:$LINENO: result: $have_pthread" >&5 echo "${ECHO_T}$have_pthread" >&6 fi @@ -6733,7 +7388,6 @@ echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6744,11 +7398,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6761,7 +7425,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -6769,7 +7433,6 @@ echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6787,6 +7450,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -6806,33 +7470,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -6871,7 +7534,6 @@ echo "$as_me:$LINENO: checking GL/glu.h usability" >&5 echo $ECHO_N "checking GL/glu.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6882,11 +7544,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6899,7 +7571,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -6907,7 +7579,6 @@ echo "$as_me:$LINENO: checking GL/glu.h presence" >&5 echo $ECHO_N "checking GL/glu.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6925,6 +7596,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -6944,33 +7616,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: GL/glu.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: GL/glu.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: GL/glu.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: GL/glu.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glu.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: GL/glu.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glu.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: GL/glu.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glu.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: GL/glu.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -7102,8 +7773,8 @@ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break + test -f $ac_im_libdir/libX11.$ac_extension; then + ac_im_usrlibdir=$ac_im_libdir; break fi done # Screen out bogus values from the imake configuration. They are @@ -7163,7 +7834,6 @@ # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7181,6 +7851,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -7211,7 +7882,6 @@ ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7228,11 +7898,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7257,7 +7937,8 @@ done done fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then @@ -7266,7 +7947,7 @@ else # Record where we found X for the cache. ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" + ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" fi fi @@ -7313,7 +7994,6 @@ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7330,11 +8010,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7347,7 +8037,8 @@ ac_R_nospace=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -7355,7 +8046,6 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7372,11 +8062,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7389,7 +8089,8 @@ ac_R_space=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 @@ -7415,7 +8116,6 @@ # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7439,11 +8139,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7462,7 +8172,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7486,11 +8195,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7503,7 +8222,8 @@ ac_cv_lib_dnet_dnet_ntoa=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 @@ -7521,7 +8241,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7545,11 +8264,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7562,7 +8291,8 @@ ac_cv_lib_dnet_stub_dnet_ntoa=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 @@ -7573,7 +8303,8 @@ fi fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, @@ -7590,21 +8321,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. + For example, HP-UX 11i declares gettimeofday. */ +#define gethostbyname innocuous_gethostbyname + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef gethostbyname + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7635,11 +8373,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7652,7 +8400,8 @@ ac_cv_func_gethostbyname=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 @@ -7666,7 +8415,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7690,11 +8438,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7707,7 +8465,8 @@ ac_cv_lib_nsl_gethostbyname=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 @@ -7717,7 +8476,7 @@ fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7725,7 +8484,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7749,11 +8507,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7766,7 +8534,8 @@ ac_cv_lib_bsd_gethostbyname=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 @@ -7791,21 +8560,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define connect to an innocuous variant, in case declares connect. + For example, HP-UX 11i declares gettimeofday. */ +#define connect innocuous_connect + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef connect + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7836,11 +8612,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7853,7 +8639,8 @@ ac_cv_func_connect=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 @@ -7867,7 +8654,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7891,11 +8677,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7908,7 +8704,8 @@ ac_cv_lib_socket_connect=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 @@ -7926,21 +8723,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define remove to an innocuous variant, in case declares remove. + For example, HP-UX 11i declares gettimeofday. */ +#define remove innocuous_remove + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef remove + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7971,11 +8775,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7988,7 +8802,8 @@ ac_cv_func_remove=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 @@ -8002,7 +8817,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8026,11 +8840,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8043,7 +8867,8 @@ ac_cv_lib_posix_remove=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 @@ -8061,21 +8886,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define shmat to an innocuous variant, in case declares shmat. + For example, HP-UX 11i declares gettimeofday. */ +#define shmat innocuous_shmat + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef shmat + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -8106,11 +8938,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8123,7 +8965,8 @@ ac_cv_func_shmat=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 @@ -8137,7 +8980,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8161,11 +9003,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8178,7 +9030,8 @@ ac_cv_lib_ipc_shmat=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 @@ -8207,7 +9060,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8231,11 +9083,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8248,7 +9110,8 @@ ac_cv_lib_ICE_IceConnectionNumber=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 @@ -8293,7 +9156,6 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_dlopen=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8317,11 +9179,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8333,12 +9205,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_dlopen" = no; then for ac_lib in dl; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8362,11 +9234,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8379,7 +9261,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext done fi LIBS=$ac_func_search_save_LIBS @@ -8404,7 +9287,6 @@ echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8415,11 +9297,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8432,7 +9324,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -8440,7 +9332,6 @@ echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8458,6 +9349,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -8477,33 +9369,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -8530,7 +9421,6 @@ LIBS="-lGL \ -lm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8554,11 +9444,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8571,7 +9471,8 @@ ac_cv_lib_GL_glXMakeCurrent=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXMakeCurrent" >&5 @@ -8592,7 +9493,6 @@ LIBS="-lMesaGL \ -lm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8616,11 +9516,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8633,7 +9543,8 @@ ac_cv_lib_MesaGL_glXMakeCurrent=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_MesaGL_glXMakeCurrent" >&5 @@ -8664,7 +9575,6 @@ echo "$as_me:$LINENO: checking GL/glu.h usability" >&5 echo $ECHO_N "checking GL/glu.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8675,11 +9585,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8692,7 +9612,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -8700,7 +9620,6 @@ echo "$as_me:$LINENO: checking GL/glu.h presence" >&5 echo $ECHO_N "checking GL/glu.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8718,6 +9637,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -8737,33 +9657,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: GL/glu.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: GL/glu.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: GL/glu.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: GL/glu.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glu.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: GL/glu.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glu.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: GL/glu.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glu.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: GL/glu.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -8873,7 +9792,6 @@ echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5 echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8884,11 +9802,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8901,7 +9829,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -8909,7 +9837,6 @@ echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5 echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8927,6 +9854,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -8946,33 +9874,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -8998,7 +9925,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXft $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9022,11 +9948,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9039,7 +9975,8 @@ ac_cv_lib_Xft_XftDrawCreate=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftDrawCreate" >&5 @@ -9071,7 +10008,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9083,11 +10019,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9100,7 +10046,7 @@ ac_cv_header_X11_extensions_Xdbe_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xdbe_h" >&5 echo "${ECHO_T}$ac_cv_header_X11_extensions_Xdbe_h" >&6 @@ -9273,7 +10219,6 @@ OLDCFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-exceptions" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9290,11 +10235,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9310,7 +10265,7 @@ echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$OLDCFLAGS" # See if we are running Solaris; if so, try the -fpermissive option... @@ -9318,7 +10273,7 @@ # bugs in the X headers up through Solaris 7. # # Unlike the other compiler/optimization settings, this one is placed - # in CFLAGS and CXXFLAGS so that fltk-config will provide the option + # in CFLAGS and CXXFLAGS so that fltk-utf8-config will provide the option # to clients - otherwise client apps will not compile properly... if test "$uname" = SunOS; then echo "$as_me:$LINENO: checking if GCC supports -fpermissive" >&5 @@ -9327,7 +10282,6 @@ OLDCFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fpermissive" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9344,11 +10298,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9365,7 +10329,7 @@ echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi else case "$uname" in @@ -9458,11 +10422,11 @@ ;; *) # Running some other operating system; inform the user they - # should contribute the necessary options to fltk-bugs@fltk.org... + # should contribute the necessary options to fltk-utf8-bugs@fltk-utf8.org... { echo "$as_me:$LINENO: WARNING: Building FLTK with default compiler optimizations" >&5 echo "$as_me: WARNING: Building FLTK with default compiler optimizations" >&2;} - { echo "$as_me:$LINENO: WARNING: Contact fltk-bugs@fltk.org with uname and compiler options." >&5 -echo "$as_me: WARNING: Contact fltk-bugs@fltk.org with uname and compiler options." >&2;} + { echo "$as_me:$LINENO: WARNING: Contact fltk-utf8-bugs@fltk-utf8.org with uname and compiler options." >&5 +echo "$as_me: WARNING: Contact fltk-utf8-bugs@fltk-utf8.org with uname and compiler options." >&2;} ;; esac fi @@ -9471,31 +10435,31 @@ if test x$prefix = xNONE; then cat >>confdefs.h <<_ACEOF -#define FLTK_DOCDIR "/usr/local/share/doc/fltk" +#define FLTK_DOCDIR "/usr/local/share/doc/fltk-utf8" _ACEOF else cat >>confdefs.h <<_ACEOF -#define FLTK_DOCDIR "$prefix/share/doc/fltk" +#define FLTK_DOCDIR "$prefix/share/doc/fltk-utf8" _ACEOF fi if test x$prefix = xNONE; then cat >>confdefs.h <<_ACEOF -#define FLTK_DATADIR "/usr/local/share/fltk" +#define FLTK_DATADIR "/usr/local/share/fltk-utf8" _ACEOF else cat >>confdefs.h <<_ACEOF -#define FLTK_DATADIR "$prefix/share/fltk" +#define FLTK_DATADIR "$prefix/share/fltk-utf8" _ACEOF fi ac_config_headers="$ac_config_headers config.h:configh.in" - ac_config_files="$ac_config_files makeinclude fltk.list fltk-config FL/Makefile" + ac_config_files="$ac_config_files makeinclude fltk-utf8.list fltk-utf8-config FL/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -9524,13 +10488,13 @@ # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -9560,13 +10524,13 @@ # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ + ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; +s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; -s/^[^=]*=[ ]*$//; +s/^[^=]*=[ ]*$//; }' fi @@ -9577,7 +10541,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' @@ -9621,9 +10585,10 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -9642,7 +10607,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -9821,16 +10786,17 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -9857,7 +10823,7 @@ cat >&5 <<_CSEOF This file was extended by $as_me, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -9901,9 +10867,9 @@ -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + instantiate the configuration header FILE Configuration files: $config_files @@ -9917,11 +10883,10 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.57, +configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir @@ -10020,8 +10985,8 @@ case "$ac_config_target" in # Handling of arguments. "makeinclude" ) CONFIG_FILES="$CONFIG_FILES makeinclude" ;; - "fltk.list" ) CONFIG_FILES="$CONFIG_FILES fltk.list" ;; - "fltk-config" ) CONFIG_FILES="$CONFIG_FILES fltk-config" ;; + "fltk-utf8.list" ) CONFIG_FILES="$CONFIG_FILES fltk-utf8.list" ;; + "fltk-utf8-config" ) CONFIG_FILES="$CONFIG_FILES fltk-utf8-config" ;; "FL/Makefile" ) CONFIG_FILES="$CONFIG_FILES FL/Makefile" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:configh.in" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -10126,6 +11091,7 @@ s,@DSOCOMMAND@,$DSOCOMMAND,;t t s,@DSOLINK@,$DSOLINK,;t t s,@DSONAME@,$DSONAME,;t t +s,@XDSONAME@,$XDSONAME,;t t s,@FLDSONAME@,$FLDSONAME,;t t s,@GLDSONAME@,$GLDSONAME,;t t s,@IMGDSONAME@,$IMGDSONAME,;t t @@ -10151,6 +11117,7 @@ s,@LIBCOMMAND@,$LIBCOMMAND,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t +s,@HAVE_LIBC_ICONV@,$HAVE_LIBC_ICONV,;t t s,@IMAGELIBS@,$IMAGELIBS,;t t s,@JPEG@,$JPEG,;t t s,@JPEGINC@,$JPEGINC,;t t @@ -10201,9 +11168,9 @@ (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end @@ -10221,21 +11188,21 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -10251,10 +11218,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -10292,12 +11259,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac @@ -10315,7 +11315,7 @@ configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -10324,24 +11324,24 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo $f;; + echo "$f";; *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } _ACEOF @@ -10382,12 +11382,12 @@ # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' ac_dC=' ' ac_dD=',;t' # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' ac_uB='$,\1#\2define\3' ac_uC=' ' ac_uD=',;t' @@ -10396,11 +11396,11 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac @@ -10414,28 +11414,29 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo $f;; + # Do quote $f, to prevent DOS paths from being IFS'd. + echo "$f";; *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in _ACEOF @@ -10458,9 +11459,9 @@ s,[\\$`],\\&,g t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp : end _ACEOF # If some macros were called several times there might be several times @@ -10474,13 +11475,13 @@ # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, _ACEOF # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail @@ -10489,7 +11490,7 @@ # Write a limited-size here document to $tmp/defines.sed. echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -10516,7 +11517,7 @@ # Write a limited-size here document to $tmp/undefs.sed. echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -10550,10 +11551,10 @@ else ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -10569,10 +11570,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -10625,5 +11626,5 @@ fi -chmod +x fltk-config +chmod +x fltk-utf8-config diff -ur -- fltk-1.1.6/configure.in fltk-utf8-1.1.6/configure.in --- fltk-1.1.6/configure.in 2004-11-20 03:44:17.000000000 +0000 +++ fltk-utf8-1.1.6/configure.in 2005-06-28 16:07:31.000000000 +0100 @@ -22,7 +22,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 dnl USA. dnl -dnl Please report all bugs and problems to "fltk-bugs@fltk.org". +dnl Please report all bugs and problems to "fltk-utf8-bugs@fltk-utf8.org". dnl dnl We need at least autoconf 2.13... @@ -78,16 +78,16 @@ esac dnl Define the libraries and link options we'll need. -LINKFLTK="-lfltk" -LINKFLTKGL="-lfltk_gl" -LINKFLTKIMG="-lfltk_images" +LINKFLTK="-lfltk-utf8 -lfltk_xutf8" +LINKFLTKGL="-lfltk-utf8_gl" +LINKFLTKIMG="-lfltk-utf8_images" GLDEMOS="gldemos" LIBEXT=".a" -LIBNAME="../lib/libfltk.a" -FLLIBNAME="../lib/libfltk_forms.a" -GLLIBNAME="../lib/libfltk_gl.a" -IMGLIBNAME="../lib/libfltk_images.a" +LIBNAME="../lib/libfltk-utf8.a" +FLLIBNAME="../lib/libfltk-utf8_forms.a" +GLLIBNAME="../lib/libfltk-utf8_gl.a" +IMGLIBNAME="../lib/libfltk-utf8_images.a" AC_SUBST(FLLIBNAME) AC_SUBST(GLDEMOS) @@ -117,68 +117,75 @@ case $uname in Darwin*) - DSONAME="libfltk.$FL_API_VERSION.dylib" - FLDSONAME="libfltk_forms.$FL_API_VERSION.dylib" - GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib" - IMGDSONAME="libfltk_images.$FL_API_VERSION.dylib" + DSONAME="libfltk-utf8.$FL_API_VERSION.dylib" + XDSONAME="libfltk_xutf8.$FL_API_VERSION.dylib" + FLDSONAME="libfltk-utf8_forms.$FL_API_VERSION.dylib" + GLDSONAME="libfltk-utf8_gl.$FL_API_VERSION.dylib" + IMGDSONAME="libfltk-utf8_images.$FL_API_VERSION.dylib" DSOCOMMAND="\$(CC) $DSOFLAGS -dynamiclib -lc -o" ;; SunOS* | UNIX_S*) - DSONAME="libfltk.so.$FL_API_VERSION" - FLDSONAME="libfltk_forms.so.$FL_API_VERSION" - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" + DSONAME="libfltk-utf8.so.$FL_API_VERSION" + XDSONAME="libfltk_xutf8.so.$FL_API_VERSION" + FLDSONAME="libfltk-utf8_forms.so.$FL_API_VERSION" + GLDSONAME="libfltk-utf8_gl.so.$FL_API_VERSION" + IMGDSONAME="libfltk-utf8_images.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) -h \$@ \$(LDLIBS) -G $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib"; then DSOLINK="-R$libdir" fi ;; HP-UX*) - DSONAME="libfltk.sl.$FL_API_VERSION" - FLDSONAME="libfltk_forms.sl.$FL_API_VERSION" - GLDSONAME="libfltk_gl.sl.$FL_API_VERSION" - IMGDSONAME="libfltk_images.sl.$FL_API_VERSION" + DSONAME="libfltk-utf8.sl.$FL_API_VERSION" + XDSONAME="libfltk_xutf8.sl.$FL_API_VERSION" + FLDSONAME="libfltk-utf8_forms.sl.$FL_API_VERSION" + GLDSONAME="libfltk-utf8_gl.sl.$FL_API_VERSION" + IMGDSONAME="libfltk-utf8_images.sl.$FL_API_VERSION" DSOCOMMAND="ld -b -z +h \$@ $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib"; then DSOLINK="-Wl,-rpath,$libdir" fi ;; IRIX*) - DSONAME="libfltk.so.$FL_API_VERSION" - FLDSONAME="libfltk_forms.so.$FL_API_VERSION" - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" + DSONAME="libfltk-utf8.so.$FL_API_VERSION" + XDSONAME="libfltk_xutf8.so.$FL_API_VERSION" + FLDSONAME="libfltk-utf8_forms.so.$FL_API_VERSION" + GLDSONAME="libfltk-utf8_gl.so.$FL_API_VERSION" + IMGDSONAME="libfltk-utf8_images.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) -Wl,-soname,\$@,-set_version,sgi1.1 \$(LDLIBS) -shared $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32" -a "x$libdir" != "x/usr/lib64"; then DSOLINK="-Wl,-rpath,$libdir" fi ;; OSF1*) - DSONAME="libfltk.so.$FL_API_VERSION" - FLDSONAME="libfltk_forms.so.$FL_API_VERSION" - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" + DSONAME="libfltk-utf8.so.$FL_API_VERSION" + XDSONAME="libfltk_xutf8.so.$FL_API_VERSION" + FLDSONAME="libfltk-utf8_forms.so.$FL_API_VERSION" + GLDSONAME="libfltk-utf8_gl.so.$FL_API_VERSION" + IMGDSONAME="libfltk-utf8_images.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32"; then DSOLINK="-Wl,-rpath,$libdir" fi ;; Linux* | *BSD*) - DSONAME="libfltk.so.$FL_API_VERSION" - FLDSONAME="libfltk_forms.so.$FL_API_VERSION" - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" + DSONAME="libfltk-utf8.so.$FL_API_VERSION" + XDSONAME="libfltk_xutf8.so.$FL_API_VERSION" + FLDSONAME="libfltk-utf8_forms.so.$FL_API_VERSION" + GLDSONAME="libfltk-utf8_gl.so.$FL_API_VERSION" + IMGDSONAME="libfltk-utf8_images.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" if test "x$libdir" != "x/usr/lib"; then DSOLINK="-Wl,-rpath,$libdir" fi ;; AIX*) - DSONAME="libfltk_s.a" - FLDSONAME="libfltk_forms_s.a" - GLDSONAME="libfltk_gl_s.a" - IMGDSONAME="libfltk_images_s.a" + DSONAME="libfltk-utf8_s.a" + XDSONAME="libfltk_xutf8_s.a" + FLDSONAME="libfltk-utf8_forms_s.a" + GLDSONAME="libfltk-utf8_gl_s.a" + IMGDSONAME="libfltk-utf8_images_s.a" DSOCOMMAND="\$(CXX) -Wl,-bexpall,-bM:SRE,-bnoentry -o" SHAREDSUFFIX="_s" ;; @@ -187,15 +194,16 @@ ;; *) AC_MSG_WARN(Shared libraries may not be supported. Trying -shared option with compiler.) - DSONAME="libfltk.so.$FL_API_VERSION" - FLDSONAME="libfltk_forms.so.$FL_API_VERSION" - GLDSONAME="libfltk_gl.so.$FL_API_VERSION" - IMGDSONAME="libfltk_images.so.$FL_API_VERSION" + DSONAME="libfltk-utf8.so.$FL_API_VERSION" + XDSONAME="libfltk_xutf8.so.$FL_API_VERSION" + FLDSONAME="libfltk-utf8_forms.so.$FL_API_VERSION" + GLDSONAME="libfltk-utf8_gl.so.$FL_API_VERSION" + IMGDSONAME="libfltk-utf8_images.so.$FL_API_VERSION" DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o" ;; esac - LINKSHARED="-L../src -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX" + LINKSHARED="-L../src -L../xutf8 -lfltk-utf8_images$SHAREDSUFFIX -lfltk-utf8_forms$SHAREDSUFFIX -lfltk-utf8$SHAREDSUFFIX -lfltk_xutf8$SHAREDSUFFIX" else DSOCOMMAND="echo" DSOLINK="" @@ -206,12 +214,13 @@ PICFLAG=0 SHAREDSUFFIX="" FLUID="fluid" - LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk" + LINKSHARED="-L../lib -lfltk-utf8_images -lfltk-utf8_forms -lfltk-utf8 -lfltk_xutf8" fi AC_SUBST(DSOCOMMAND) AC_SUBST(DSOLINK) AC_SUBST(DSONAME) +AC_SUBST(XDSONAME) AC_SUBST(FLDSONAME) AC_SUBST(GLDSONAME) AC_SUBST(IMGDSONAME) @@ -370,6 +379,13 @@ dnl FLTK library uses math library functions... AC_SEARCH_LIBS(pow, m) +HAVE_LIBC_ICONV=0 +AC_CHECK_LIB(c, iconv, + AC_DEFINE(HAVE_LIBC_ICONV) + HAVE_LIBC_ICONV=1 + ) +AC_SUBST(HAVE_LIBC_ICONV) + dnl Check for image libraries... SAVELIBS="$LIBS" IMAGELIBS="" @@ -393,7 +409,7 @@ AC_DEFINE(HAVE_LIBJPEG) JPEGINC="-I../jpeg" JPEG="jpeg" - IMAGELIBS="-lfltk_jpeg $IMAGELIBS" + IMAGELIBS="-lfltk-utf8_jpeg $IMAGELIBS" fi) AC_ARG_ENABLE(localzlib, [ --enable-localzlib use local ZLIB library, default=auto], @@ -414,8 +430,8 @@ AC_DEFINE(HAVE_LIBZ) ZLIBINC="-I../zlib" ZLIB="zlib" - LIBS="-lfltk_z $LIBS" - IMAGELIBS="-lfltk_z $IMAGELIBS" + LIBS="-lfltk-utf8_z $LIBS" + IMAGELIBS="-lfltk-utf8_z $IMAGELIBS" fi) AC_ARG_ENABLE(localpng, [ --enable-localpng use local PNG library, default=auto], @@ -437,7 +453,7 @@ AC_DEFINE(HAVE_PNG_H) PNGINC="-I../png" PNG="png" - IMAGELIBS="-lfltk_png $IMAGELIBS" + IMAGELIBS="-lfltk-utf8_png $IMAGELIBS" fi]) AC_SUBST(JPEG) @@ -795,7 +811,7 @@ # bugs in the X headers up through Solaris 7. # # Unlike the other compiler/optimization settings, this one is placed - # in CFLAGS and CXXFLAGS so that fltk-config will provide the option + # in CFLAGS and CXXFLAGS so that fltk-utf8-config will provide the option # to clients - otherwise client apps will not compile properly... if test "$uname" = SunOS; then AC_MSG_CHECKING(if GCC supports -fpermissive) @@ -897,9 +913,9 @@ ;; *) # Running some other operating system; inform the user they - # should contribute the necessary options to fltk-bugs@fltk.org... + # should contribute the necessary options to fltk-utf8-bugs@fltk-utf8.org... AC_MSG_WARN(Building FLTK with default compiler optimizations) - AC_MSG_WARN(Contact fltk-bugs@fltk.org with uname and compiler options.) + AC_MSG_WARN(Contact fltk-utf8-bugs@fltk-utf8.org with uname and compiler options.) ;; esac fi @@ -908,24 +924,24 @@ dnl Define the FLTK documentation directory... if test x$prefix = xNONE; then - AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "/usr/local/share/doc/fltk") + AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "/usr/local/share/doc/fltk-utf8") else - AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$prefix/share/doc/fltk") + AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$prefix/share/doc/fltk-utf8") fi dnl Define the FLTK data directory... if test x$prefix = xNONE; then - AC_DEFINE_UNQUOTED(FLTK_DATADIR, "/usr/local/share/fltk") + AC_DEFINE_UNQUOTED(FLTK_DATADIR, "/usr/local/share/fltk-utf8") else - AC_DEFINE_UNQUOTED(FLTK_DATADIR, "$prefix/share/fltk") + AC_DEFINE_UNQUOTED(FLTK_DATADIR, "$prefix/share/fltk-utf8") fi dnl Write all of the files... AC_CONFIG_HEADER(config.h:configh.in) -AC_OUTPUT(makeinclude fltk.list fltk-config FL/Makefile) +AC_OUTPUT(makeinclude fltk-utf8.list fltk-utf8-config FL/Makefile) -dnl Make sure the fltk-config script is executable... -chmod +x fltk-config +dnl Make sure the fltk-utf8-config script is executable... +chmod +x fltk-utf8-config dnl dnl End of "$Id: configure.in,v 1.33.2.31.2.122 2004/11/20 03:44:17 easysw Exp $". Binary files fltk-1.1.6/documentation/FL.gif and fltk-utf8-1.1.6/documentation/FL.gif differ Binary files fltk-1.1.6/documentation/Fl_File_Chooser.jpg and fltk-utf8-1.1.6/documentation/Fl_File_Chooser.jpg differ Binary files fltk-1.1.6/documentation/Fl_File_Input.gif and fltk-utf8-1.1.6/documentation/Fl_File_Input.gif differ Binary files fltk-1.1.6/documentation/Fl_Help_Dialog.gif and fltk-utf8-1.1.6/documentation/Fl_Help_Dialog.gif differ Binary files fltk-1.1.6/documentation/Fl_Light_Button.gif and fltk-utf8-1.1.6/documentation/Fl_Light_Button.gif differ Binary files fltk-1.1.6/documentation/Fl_Return_Button.gif and fltk-utf8-1.1.6/documentation/Fl_Return_Button.gif differ Binary files fltk-1.1.6/documentation/Fl_Roller.gif and fltk-utf8-1.1.6/documentation/Fl_Roller.gif differ Binary files fltk-1.1.6/documentation/Fl_Scroll.gif and fltk-utf8-1.1.6/documentation/Fl_Scroll.gif differ Binary files fltk-1.1.6/documentation/Fl_Tile.gif and fltk-utf8-1.1.6/documentation/Fl_Tile.gif differ Binary files fltk-1.1.6/documentation/Fl_Value_Input.gif and fltk-utf8-1.1.6/documentation/Fl_Value_Input.gif differ Binary files fltk-1.1.6/documentation/Fl_Value_Output.gif and fltk-utf8-1.1.6/documentation/Fl_Value_Output.gif differ Binary files fltk-1.1.6/documentation/adjuster1.gif and fltk-utf8-1.1.6/documentation/adjuster1.gif differ Binary files fltk-1.1.6/documentation/boxtypes.gif and fltk-utf8-1.1.6/documentation/boxtypes.gif differ Binary files fltk-1.1.6/documentation/buttons.gif and fltk-utf8-1.1.6/documentation/buttons.gif differ Binary files fltk-1.1.6/documentation/charts.gif and fltk-utf8-1.1.6/documentation/charts.gif differ Binary files fltk-1.1.6/documentation/choice.gif and fltk-utf8-1.1.6/documentation/choice.gif differ Binary files fltk-1.1.6/documentation/clock.gif and fltk-utf8-1.1.6/documentation/clock.gif differ Binary files fltk-1.1.6/documentation/counter.gif and fltk-utf8-1.1.6/documentation/counter.gif differ Binary files fltk-1.1.6/documentation/cubeview.gif and fltk-utf8-1.1.6/documentation/cubeview.gif differ Binary files fltk-1.1.6/documentation/dial.gif and fltk-utf8-1.1.6/documentation/dial.gif differ Binary files fltk-1.1.6/documentation/editor-replace.gif and fltk-utf8-1.1.6/documentation/editor-replace.gif differ Binary files fltk-1.1.6/documentation/editor.gif and fltk-utf8-1.1.6/documentation/editor.gif differ Binary files fltk-1.1.6/documentation/fl_alert.gif and fltk-utf8-1.1.6/documentation/fl_alert.gif differ Binary files fltk-1.1.6/documentation/fl_ask.gif and fltk-utf8-1.1.6/documentation/fl_ask.gif differ Binary files fltk-1.1.6/documentation/fl_choice.gif and fltk-utf8-1.1.6/documentation/fl_choice.gif differ Binary files fltk-1.1.6/documentation/fl_color_chooser.jpg and fltk-utf8-1.1.6/documentation/fl_color_chooser.jpg differ Binary files fltk-1.1.6/documentation/fl_input.gif and fltk-utf8-1.1.6/documentation/fl_input.gif differ Binary files fltk-1.1.6/documentation/fl_message.gif and fltk-utf8-1.1.6/documentation/fl_message.gif differ Binary files fltk-1.1.6/documentation/fl_password.gif and fltk-utf8-1.1.6/documentation/fl_password.gif differ Binary files fltk-1.1.6/documentation/fl_show_colormap.gif and fltk-utf8-1.1.6/documentation/fl_show_colormap.gif differ Binary files fltk-1.1.6/documentation/fluid-catgets.gif and fltk-utf8-1.1.6/documentation/fluid-catgets.gif differ Binary files fltk-1.1.6/documentation/fluid-gettext.gif and fltk-utf8-1.1.6/documentation/fluid-gettext.gif differ Binary files fltk-1.1.6/documentation/fluid-org.gif and fltk-utf8-1.1.6/documentation/fluid-org.gif differ Binary files fltk-1.1.6/documentation/fluid1.gif and fltk-utf8-1.1.6/documentation/fluid1.gif differ Binary files fltk-1.1.6/documentation/fluid2.gif and fltk-utf8-1.1.6/documentation/fluid2.gif differ Binary files fltk-1.1.6/documentation/fluid3-cxx.gif and fltk-utf8-1.1.6/documentation/fluid3-cxx.gif differ Binary files fltk-1.1.6/documentation/fluid3-gui.gif and fltk-utf8-1.1.6/documentation/fluid3-gui.gif differ Binary files fltk-1.1.6/documentation/fluid3-style.gif and fltk-utf8-1.1.6/documentation/fluid3-style.gif differ Binary files fltk-1.1.6/documentation/fluid4.gif and fltk-utf8-1.1.6/documentation/fluid4.gif differ Binary files fltk-1.1.6/documentation/fluid_prefs.gif and fltk-utf8-1.1.6/documentation/fluid_prefs.gif differ Binary files fltk-1.1.6/documentation/fluid_widget_cxx.gif and fltk-utf8-1.1.6/documentation/fluid_widget_cxx.gif differ Binary files fltk-1.1.6/documentation/fluid_widget_gui.gif and fltk-utf8-1.1.6/documentation/fluid_widget_gui.gif differ Binary files fltk-1.1.6/documentation/fluid_widget_style.gif and fltk-utf8-1.1.6/documentation/fluid_widget_style.gif differ Binary files fltk-1.1.6/documentation/hello.C.gif and fltk-utf8-1.1.6/documentation/hello.C.gif differ Binary files fltk-1.1.6/documentation/menu.gif and fltk-utf8-1.1.6/documentation/menu.gif differ Binary files fltk-1.1.6/documentation/menu_button.gif and fltk-utf8-1.1.6/documentation/menu_button.gif differ Binary files fltk-1.1.6/documentation/menubar.gif and fltk-utf8-1.1.6/documentation/menubar.gif differ Binary files fltk-1.1.6/documentation/positioner.gif and fltk-utf8-1.1.6/documentation/positioner.gif differ Binary files fltk-1.1.6/documentation/resizebox1.gif and fltk-utf8-1.1.6/documentation/resizebox1.gif differ Binary files fltk-1.1.6/documentation/resizebox2.gif and fltk-utf8-1.1.6/documentation/resizebox2.gif differ Binary files fltk-1.1.6/documentation/round_clock.gif and fltk-utf8-1.1.6/documentation/round_clock.gif differ Binary files fltk-1.1.6/documentation/scrollbar.gif and fltk-utf8-1.1.6/documentation/scrollbar.gif differ Binary files fltk-1.1.6/documentation/slider.gif and fltk-utf8-1.1.6/documentation/slider.gif differ Binary files fltk-1.1.6/documentation/symbols.gif and fltk-utf8-1.1.6/documentation/symbols.gif differ Binary files fltk-1.1.6/documentation/tabs.gif and fltk-utf8-1.1.6/documentation/tabs.gif differ Binary files fltk-1.1.6/documentation/text.gif and fltk-utf8-1.1.6/documentation/text.gif differ Binary files fltk-1.1.6/documentation/valuators.gif and fltk-utf8-1.1.6/documentation/valuators.gif differ Binary files fltk-1.1.6/documentation/value_slider.gif and fltk-utf8-1.1.6/documentation/value_slider.gif differ Only in fltk-1.1.6/: fltk-config.in Only in fltk-utf8-1.1.6/: fltk-utf8-config.in Only in fltk-utf8-1.1.6/: fltk-utf8.list.in Only in fltk-utf8-1.1.6/: fltk-utf8.spec Only in fltk-utf8-1.1.6/: fltk-utf8.xpm Only in fltk-1.1.6/: fltk.list.in Only in fltk-1.1.6/: fltk.spec Only in fltk-1.1.6/: fltk.xpm diff -ur -- fltk-1.1.6/fluid/Makefile fltk-utf8-1.1.6/fluid/Makefile --- fltk-1.1.6/fluid/Makefile 2004-10-18 21:22:22.000000000 +0100 +++ fltk-utf8-1.1.6/fluid/Makefile 2005-06-28 15:55:05.000000000 +0100 @@ -20,7 +20,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. # -# Please report all bugs and problems to "fltk-bugs@fltk.org". +# Please report all bugs and problems to "fltk-uf8-bugs@fltk-uf8.org". # CPPFILES = \ @@ -54,7 +54,7 @@ fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \ ../lib/$(IMGLIBNAME) echo Linking $@... - $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) + $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LDLIBS) $(LINKFLTKFORMS) $(POSTBUILD) $@ ../FL/mac.r fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ @@ -77,7 +77,7 @@ -$(MKDIR) $(DESTDIR)$(bindir) $(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/fluid$(EXEEXT) - $(DESTDIR)$(bindir)/fltk-config --post $(DESTDIR)$(bindir)/fluid$(EXEEXT) + $(DESTDIR)$(bindir)/fltk-utf8-config --post $(DESTDIR)$(bindir)/fluid$(EXEEXT) $(CHMOD) 755 $(DESTDIR)$(bindir)/fluid$(EXEEXT) uninstall: Binary files fltk-1.1.6/fluid/fluid.icns and fltk-utf8-1.1.6/fluid/fluid.icns differ diff -ur -- fltk-1.1.6/fluid/makedepend fltk-utf8-1.1.6/fluid/makedepend --- fltk-1.1.6/fluid/makedepend 2003-01-10 19:54:44.000000000 +0000 +++ fltk-utf8-1.1.6/fluid/makedepend 2005-06-12 19:06:21.000000000 +0100 @@ -1,12 +1,13 @@ # DO NOT DELETE -Fl_Function_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Function_Type.o: Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H -Fl_Function_Type.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H -Fl_Function_Type.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H -Fl_Function_Type.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H -Fl_Function_Type.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H -Fl_Function_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H +Fl_Function_Type.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Function_Type.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Type.h +Fl_Function_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H +Fl_Function_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H Fluid_Image.h +Fl_Function_Type.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H ../FL/Fl_Group.H +Fl_Function_Type.o: ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H +Fl_Function_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H +Fl_Function_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H Fl_Function_Type.o: ../FL/fl_show_input.H ../FL/fl_ask.H ../src/flstring.h Fl_Function_Type.o: ../FL/Fl_Export.H ../config.h function_panel.h Fl_Function_Type.o: ../FL/Fl_Window.H ../FL/Fl_Light_Button.H @@ -15,65 +16,69 @@ Fl_Function_Type.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H Fl_Function_Type.o: ../FL/fl_draw.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H Fl_Function_Type.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H ../FL/Fl_Box.H -Fl_Function_Type.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/fl_ask.H -Fl_Menu_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Menu_Type.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H +Fl_Function_Type.o: ../FL/fl_ask.H +Fl_Menu_Type.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Menu_Type.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Widget_Type.h +Fl_Menu_Type.o: Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H Fl_Menu_Type.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H Fl_Menu_Type.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H Fl_Menu_Type.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H Fl_Menu_Type.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H Fl_Menu_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H -Fl_Menu_Type.o: alignment_panel.h ../FL/Fl_Window.H ../FL/Fl_Preferences.H -Fl_Menu_Type.o: ../FL/Fl_Tooltip.H ../FL/Fl_Button.H ../FL/Fl_Box.H -Fl_Menu_Type.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Light_Button.H -Fl_Menu_Type.o: ../FL/Fl_Button.H ../FL/Fl_Check_Button.H -Fl_Menu_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Return_Button.H -Fl_Menu_Type.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H -Fl_Menu_Type.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_message.H -Fl_Menu_Type.o: ../FL/fl_ask.H ../src/flstring.h ../FL/Fl_Export.H -Fl_Menu_Type.o: ../config.h ../FL/Fl_Output.H ../FL/Fl_Input.H -Fl_Menu_Type.o: Shortcut_Button.h ../FL/fl_draw.H -Fl_Group_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Group_Type.o: ../FL/Fl_Group.H ../FL/fl_message.H ../FL/fl_ask.H -Fl_Group_Type.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H -Fl_Group_Type.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H -Fl_Group_Type.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H -Fl_Group_Type.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H -Fl_Group_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H -Fl_Group_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H ../FL/Fl_Scroll.H -Fl_Group_Type.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_Widget_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Widget_Type.o: ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H -Fl_Widget_Type.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H -Fl_Widget_Type.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H -Fl_Widget_Type.o: ../FL/Fl_Image.H Fluid_Image.h ../FL/Fl_Shared_Image.H -Fl_Widget_Type.o: ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Pack.H -Fl_Widget_Type.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H -Fl_Widget_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H -Fl_Widget_Type.o: alignment_panel.h ../FL/Fl_Window.H ../FL/Fl_Preferences.H -Fl_Widget_Type.o: ../FL/Fl_Tooltip.H ../FL/Fl_Button.H ../FL/Fl_Box.H -Fl_Widget_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H -Fl_Widget_Type.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H -Fl_Widget_Type.o: ../FL/Fl_Return_Button.H ../FL/Fl_Browser.H -Fl_Widget_Type.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -Fl_Widget_Type.o: ../FL/Fl_Valuator.H ../FL/fl_message.H ../FL/fl_ask.H -Fl_Widget_Type.o: ../FL/Fl_Slider.H ../src/flstring.h ../FL/Fl_Export.H -Fl_Widget_Type.o: ../config.h widget_panel.h ../FL/Fl_Double_Window.H -Fl_Widget_Type.o: ../FL/Fl_Window.H ../FL/Fl_Value_Input.H ../FL/Fl_Input.H -Fl_Widget_Type.o: Shortcut_Button.h ../FL/Fl_Text_Editor.H -Fl_Widget_Type.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H -Fl_Widget_Type.o: ../FL/Fl_Text_Buffer.H ../FL/fl_show_colormap.H -Fl_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Type.o: ../FL/Fl_Browser_.H ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H -Fl_Type.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H -Fl_Type.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h Fl_Type.h -Fl_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H -Fl_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H Fluid_Image.h -Fl_Type.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H ../FL/Fl_Pack.H -Fl_Type.o: ../FL/Fl_Group.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H -Fl_Type.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H -Fl_Type.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Pixmap.H pixmaps/lock.xpm -Fl_Type.o: pixmaps/flWindow.xpm pixmaps/flButton.xpm +Fl_Menu_Type.o: alignment_panel.h ../FL/Fl_Text_Buffer.H +Fl_Menu_Type.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Scrollbar.H +Fl_Menu_Type.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H +Fl_Menu_Type.o: ../FL/Fl_Window.H ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H +Fl_Menu_Type.o: ../FL/Fl_Button.H ../FL/Fl_Box.H ../FL/Fl_Input.H +Fl_Menu_Type.o: ../FL/Fl_Input_.H ../FL/Fl_Light_Button.H ../FL/Fl_Button.H +Fl_Menu_Type.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H +Fl_Menu_Type.o: ../FL/Fl_Return_Button.H ../FL/fl_message.H ../FL/fl_ask.H +Fl_Menu_Type.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h +Fl_Menu_Type.o: ../FL/Fl_Output.H ../FL/Fl_Input.H Shortcut_Button.h +Fl_Menu_Type.o: ../FL/fl_draw.H +Fl_Group_Type.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Group_Type.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Group.H +Fl_Group_Type.o: ../FL/fl_message.H ../FL/fl_ask.H Fl_Widget_Type.h Fl_Type.h +Fl_Group_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H +Fl_Group_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H Fluid_Image.h +Fl_Group_Type.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H ../FL/Fl_Group.H +Fl_Group_Type.o: ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H +Fl_Group_Type.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H +Fl_Group_Type.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Scroll.H ../FL/Fl_Scrollbar.H +Fl_Group_Type.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H +Fl_Widget_Type.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Widget_Type.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Group.H +Fl_Widget_Type.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H Fl_Widget_Type.h +Fl_Widget_Type.o: Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H +Fl_Widget_Type.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H +Fl_Widget_Type.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H +Fl_Widget_Type.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H +Fl_Widget_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H +Fl_Widget_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H alignment_panel.h +Fl_Widget_Type.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H +Fl_Widget_Type.o: ../FL/fl_draw.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H +Fl_Widget_Type.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H +Fl_Widget_Type.o: ../FL/Fl_Window.H ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H +Fl_Widget_Type.o: ../FL/Fl_Button.H ../FL/Fl_Box.H ../FL/Fl_Light_Button.H +Fl_Widget_Type.o: ../FL/Fl_Button.H ../FL/Fl_Check_Button.H +Fl_Widget_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Return_Button.H +Fl_Widget_Type.o: ../FL/fl_message.H ../FL/fl_ask.H ../FL/Fl_Slider.H +Fl_Widget_Type.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h +Fl_Widget_Type.o: widget_panel.h ../FL/Fl_Double_Window.H ../FL/Fl_Window.H +Fl_Widget_Type.o: ../FL/Fl_Value_Input.H ../FL/Fl_Input.H Shortcut_Button.h +Fl_Widget_Type.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H +Fl_Widget_Type.o: ../FL/fl_show_colormap.H +Fl_Type.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Type.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Browser_.H +Fl_Type.o: ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H +Fl_Type.o: ../FL/Fl_Valuator.H ../FL/fl_draw.H ../src/flstring.h +Fl_Type.o: ../FL/Fl_Export.H ../config.h Fl_Type.h ../FL/Fl_Widget.H +Fl_Type.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H +Fl_Type.o: ../FL/Fl_Image.H Fluid_Image.h ../FL/Fl_Shared_Image.H +Fl_Type.o: ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H +Fl_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H +Fl_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H ../FL/Fl_Pixmap.H +Fl_Type.o: pixmaps/lock.xpm pixmaps/flWindow.xpm pixmaps/flButton.xpm Fl_Type.o: pixmaps/flCheckButton.xpm pixmaps/flRoundButton.xpm Fl_Type.o: pixmaps/flBox.xpm pixmaps/flGroup.xpm pixmaps/flFunction.xpm Fl_Type.o: pixmaps/flCode.xpm pixmaps/flCodeBlock.xpm @@ -92,7 +97,8 @@ Fl_Type.o: pixmaps/flValueSlider.xpm pixmaps/flAdjuster.xpm Fl_Type.o: pixmaps/flCounter.xpm pixmaps/flDial.xpm pixmaps/flRoller.xpm Fl_Type.o: pixmaps/flValueInput.xpm pixmaps/flValueOutput.xpm -Fl_Window_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Window_Type.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Window_Type.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Window_Type.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H Fl_Window_Type.o: ../FL/Fl_Window.H ../FL/fl_message.H ../FL/fl_ask.H Fl_Window_Type.o: ../FL/fl_draw.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H @@ -102,49 +108,53 @@ Fl_Window_Type.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H Fl_Window_Type.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H Fl_Window_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H -Fl_Window_Type.o: alignment_panel.h ../FL/Fl_Window.H ../FL/Fl_Preferences.H -Fl_Window_Type.o: ../FL/Fl_Tooltip.H ../FL/Fl_Button.H ../FL/Fl_Box.H -Fl_Window_Type.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Light_Button.H -Fl_Window_Type.o: ../FL/Fl_Button.H ../FL/Fl_Check_Button.H -Fl_Window_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Return_Button.H -Fl_Window_Type.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H -Fl_Window_Type.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H widget_panel.h +Fl_Window_Type.o: alignment_panel.h ../FL/Fl_Text_Buffer.H +Fl_Window_Type.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H +Fl_Window_Type.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H +Fl_Window_Type.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Window.H +Fl_Window_Type.o: ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H ../FL/Fl_Button.H +Fl_Window_Type.o: ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H +Fl_Window_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H +Fl_Window_Type.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H +Fl_Window_Type.o: ../FL/Fl_Return_Button.H widget_panel.h Fl_Window_Type.o: ../FL/Fl_Double_Window.H ../FL/Fl_Value_Input.H Fl_Window_Type.o: ../FL/Fl_Input.H Shortcut_Button.h ../FL/Fl_Text_Editor.H -Fl_Window_Type.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H -Fl_Window_Type.o: ../FL/Fl_Text_Buffer.H ../src/flstring.h ../FL/Fl_Export.H +Fl_Window_Type.o: ../FL/Fl_Text_Display.H ../src/flstring.h ../FL/Fl_Export.H Fl_Window_Type.o: ../config.h -Fluid_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fluid_Image.o: ../FL/Fl_Widget.H Fl_Type.h ../FL/Fl_Menu.H -Fluid_Image.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H -Fluid_Image.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H -Fluid_Image.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H -Fluid_Image.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H -Fluid_Image.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H -Fluid_Image.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h -Fluid_Image.o: ../FL/filename.H ../FL/Fl_File_Chooser.H ../FL/Fl_Window.H -Fluid_Image.o: ../FL/Fl_Button.H ../FL/Fl_Preferences.H ../FL/Fl_Tile.H -Fluid_Image.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H -Fluid_Image.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fluid_Image.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/filename.H -Fluid_Image.o: ../FL/Fl_Box.H ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H -Fluid_Image.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H ../FL/Fl_Input_.H -Fluid_Image.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H ../FL/fl_ask.H +Fluid_Image.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fluid_Image.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Widget.H +Fluid_Image.o: Fl_Type.h ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H +Fluid_Image.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H Fluid_Image.h +Fluid_Image.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H ../FL/Fl_Group.H +Fluid_Image.o: ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H +Fluid_Image.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H +Fluid_Image.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H ../src/flstring.h +Fluid_Image.o: ../FL/Fl_Export.H ../config.h ../FL/filename.H +Fluid_Image.o: ../FL/Fl_File_Chooser.H ../FL/Fl_Double_Window.H +Fluid_Image.o: ../FL/Fl_Window.H ../FL/Fl_Button.H ../FL/Fl_Preferences.H +Fluid_Image.o: ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H +Fluid_Image.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H +Fluid_Image.o: ../FL/Fl_Valuator.H ../FL/Fl_File_Icon.H ../FL/Fl.H +Fluid_Image.o: ../FL/filename.H ../FL/Fl_Box.H ../FL/Fl_Check_Button.H +Fluid_Image.o: ../FL/Fl_Light_Button.H ../FL/Fl_File_Input.H ../FL/Fl_Input.H +Fluid_Image.o: ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H +Fluid_Image.o: ../FL/fl_ask.H code.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H -code.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Type.h ../FL/Fl_Widget.H -code.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H -code.o: ../FL/Fl_Image.H Fluid_Image.h ../FL/Fl_Shared_Image.H -code.o: ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H -code.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H -code.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H -code.o: alignment_panel.h ../FL/Fl_Window.H ../FL/Fl_Preferences.H -code.o: ../FL/Fl_Tooltip.H ../FL/Fl_Button.H ../FL/Fl_Box.H ../FL/Fl_Input.H -code.o: ../FL/Fl_Input_.H ../FL/Fl_Light_Button.H ../FL/Fl_Button.H -code.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H -code.o: ../FL/Fl_Return_Button.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H -code.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -code.o: ../FL/filename.H -factory.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Group.H +code.o: ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h ../FL/Enumerations.H +code.o: ../FL/Fl_Export.H Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H +code.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H Fluid_Image.h +code.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H ../FL/Fl_Group.H +code.o: ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H +code.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H +code.o: ../FL/Fl_Menu_Bar.H alignment_panel.h ../FL/Fl_Text_Buffer.H +code.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Scrollbar.H +code.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H +code.o: ../FL/Fl_Window.H ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H +code.o: ../FL/Fl_Button.H ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H +code.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_Check_Button.H +code.o: ../FL/Fl_Light_Button.H ../FL/Fl_Return_Button.H ../FL/filename.H +factory.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +factory.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Group.H factory.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H factory.o: ../FL/Fl_Pixmap.H ../src/flstring.h ../FL/Fl_Export.H ../config.h factory.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H @@ -169,87 +179,93 @@ factory.o: ../FL/Fl_Value_Output.H ../FL/Fl_Value_Slider.H factory.o: ../FL/Fl_Multi_Label.H file.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h alignment_panel.h -file.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H -file.o: ../FL/Fl_Group.H ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H -file.o: ../FL/Fl_Widget.H ../FL/Fl_Button.H ../FL/Fl_Tabs.H ../FL/Fl_Group.H -file.o: ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H -file.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_Choice.H -file.o: ../FL/Fl_Menu_.H ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H -file.o: ../FL/Fl_Return_Button.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H -file.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -file.o: ../FL/fl_message.H ../FL/fl_ask.H Fl_Widget_Type.h Fl_Type.h -file.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H +file.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +file.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Text_Buffer.H +file.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Group.H +file.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H +file.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H ../FL/Fl_Window.H +file.o: ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H +file.o: ../FL/Fl_Button.H ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Box.H +file.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Light_Button.H +file.o: ../FL/Fl_Button.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H +file.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H +file.o: ../FL/Fl_Return_Button.H ../FL/fl_message.H ../FL/fl_ask.H +file.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H file.o: ../FL/Fl_Image.H Fluid_Image.h ../FL/Fl_Shared_Image.H file.o: ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H file.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_Bar.H -fluid.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fluid.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Box.H -fluid.o: ../FL/Fl_Button.H ../FL/Fl_File_Icon.H ../FL/Fl.H -fluid.o: ../FL/Fl_Help_Dialog.H ../FL/Fl_Help_View.H ../FL/Fl_Group.H -fluid.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -fluid.o: ../FL/fl_draw.H ../FL/Fl_Shared_Image.H ../FL/Fl_Hold_Browser.H -fluid.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Menu_Bar.H -fluid.o: ../FL/Fl_Menu_.H ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/fl_ask.H -fluid.o: ../FL/fl_draw.H ../FL/Fl_File_Chooser.H ../FL/Fl_Window.H -fluid.o: ../FL/Fl_Group.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Button.H -fluid.o: ../FL/Fl_Preferences.H ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H -fluid.o: ../FL/Fl_File_Icon.H ../FL/filename.H ../FL/Fl_Check_Button.H -fluid.o: ../FL/Fl_Light_Button.H ../FL/Fl_File_Input.H -fluid.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H ../FL/fl_message.H -fluid.o: ../FL/fl_ask.H ../FL/filename.H ../src/flstring.h ../FL/Fl_Export.H -fluid.o: ../config.h alignment_panel.h ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H -fluid.o: ../FL/Fl_Tabs.H ../FL/Fl_Light_Button.H ../FL/Fl_Browser.H +fluid.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fluid.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Double_Window.H +fluid.o: ../FL/Fl_Window.H ../FL/Fl_Box.H ../FL/Fl_Button.H +fluid.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/Fl_Help_Dialog.H +fluid.o: ../FL/Fl_Help_View.H ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H +fluid.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H +fluid.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Group.H ../FL/Fl_Input.H +fluid.o: ../FL/Fl_Input_.H ../FL/Fl_Hold_Browser.H ../FL/Fl_Browser.H +fluid.o: ../FL/Fl_Browser_.H ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H +fluid.o: ../FL/fl_ask.H ../FL/fl_draw.H ../FL/Fl_File_Chooser.H +fluid.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Button.H ../FL/Fl_Preferences.H +fluid.o: ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H ../FL/Fl_File_Icon.H +fluid.o: ../FL/filename.H ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H +fluid.o: ../FL/Fl_File_Input.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H +fluid.o: ../FL/fl_message.H ../FL/fl_ask.H ../FL/filename.H ../src/flstring.h +fluid.o: ../FL/Fl_Export.H ../config.h alignment_panel.h +fluid.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H ../FL/Fl_Widget.H +fluid.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Window.H ../FL/Fl_Tooltip.H +fluid.o: ../FL/Fl_Widget.H ../FL/Fl_Tabs.H ../FL/Fl_Light_Button.H fluid.o: function_panel.h ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H -fluid.o: ../FL/Fl_Widget.H ../FL/Fl_Text_Buffer.H about_panel.h Fl_Type.h -fluid.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H Fluid_Image.h -fluid.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H -fluid.o: ../FL/Fl_Menu_.H -align_widget.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -align_widget.o: ../FL/Fl_Window.H ../FL/Fl_Group.H Fl_Widget_Type.h Fl_Type.h -align_widget.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H -align_widget.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H Fluid_Image.h -align_widget.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H ../FL/Fl_Pack.H -align_widget.o: ../FL/Fl_Group.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H -align_widget.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H -align_widget.o: ../FL/Fl_Menu_Bar.H -about_panel.o: about_panel.h ../FL/Fl.H ../FL/Enumerations.H -about_panel.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H -about_panel.o: ../FL/Fl_Group.H ../FL/Fl_Box.H ../FL/Fl_Button.H -about_panel.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H -widget_panel.o: widget_panel.h ../FL/Fl.H ../FL/Enumerations.H -widget_panel.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H ../FL/Fl_Window.H -widget_panel.o: ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Group.H -widget_panel.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Choice.H -widget_panel.o: ../FL/Fl_Menu_.H ../FL/Fl_Button.H ../FL/Fl_Box.H -widget_panel.o: ../FL/Fl_Value_Input.H ../FL/Fl_Valuator.H ../FL/Fl_Input.H -widget_panel.o: Shortcut_Button.h ../FL/Fl_Light_Button.H ../FL/Fl_Button.H +fluid.o: about_panel.h Fl_Type.h ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H +fluid.o: ../FL/Fl_Image.H Fluid_Image.h ../FL/Fl_Shared_Image.H +fluid.o: ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H +align_widget.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +align_widget.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H +align_widget.o: ../FL/Fl_Group.H Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H +align_widget.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H +align_widget.o: ../FL/Fl_Image.H Fluid_Image.h ../FL/Fl_Shared_Image.H +align_widget.o: ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Group.H +align_widget.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H +align_widget.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H +about_panel.o: about_panel.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +about_panel.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +about_panel.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Group.H +about_panel.o: ../FL/Fl_Box.H ../FL/Fl_Button.H ../FL/Fl_Return_Button.H +about_panel.o: ../FL/Fl_Button.H +widget_panel.o: widget_panel.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +widget_panel.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +widget_panel.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Tabs.H +widget_panel.o: ../FL/Fl_Group.H ../FL/Fl_Group.H ../FL/Fl_Input.H +widget_panel.o: ../FL/Fl_Input_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H +widget_panel.o: ../FL/Fl_Button.H ../FL/Fl_Box.H ../FL/Fl_Value_Input.H +widget_panel.o: ../FL/Fl_Valuator.H ../FL/Fl_Input.H Shortcut_Button.h +widget_panel.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H widget_panel.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H widget_panel.o: ../FL/fl_draw.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H widget_panel.o: ../FL/Fl_Slider.H ../FL/Fl_Text_Buffer.H widget_panel.o: ../FL/Fl_Return_Button.H -alignment_panel.o: alignment_panel.h ../FL/Fl.H ../FL/Enumerations.H -alignment_panel.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H +alignment_panel.o: alignment_panel.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +alignment_panel.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +alignment_panel.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H +alignment_panel.o: ../FL/fl_draw.H ../FL/Fl_Group.H ../FL/Fl_Widget.H +alignment_panel.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H +alignment_panel.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Window.H alignment_panel.o: ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H alignment_panel.o: ../FL/Fl_Widget.H ../FL/Fl_Button.H ../FL/Fl_Tabs.H alignment_panel.o: ../FL/Fl_Group.H ../FL/Fl_Box.H ../FL/Fl_Input.H alignment_panel.o: ../FL/Fl_Input_.H ../FL/Fl_Light_Button.H alignment_panel.o: ../FL/Fl_Button.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H alignment_panel.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H -alignment_panel.o: ../FL/Fl_Return_Button.H ../FL/Fl_Browser.H -alignment_panel.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -alignment_panel.o: ../FL/Fl_Valuator.H -function_panel.o: function_panel.h ../FL/Fl.H ../FL/Enumerations.H -function_panel.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H -function_panel.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_Input.H -function_panel.o: ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H -function_panel.o: ../FL/Fl_Button.H ../FL/Fl_Group.H ../FL/Fl_Text_Editor.H -function_panel.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Widget.H -function_panel.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -function_panel.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Box.H -function_panel.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H -function_panel.o: ../FL/Fl_Pixmap.H ../FL/Fl_Image.H Fl_Type.h -function_panel.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H -function_panel.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H -function_panel.o: ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H -function_panel.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H -function_panel.o: ../FL/Fl_Menu_Bar.H +alignment_panel.o: ../FL/Fl_Return_Button.H +function_panel.o: function_panel.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +function_panel.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +function_panel.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Light_Button.H +function_panel.o: ../FL/Fl_Button.H ../FL/Fl_Input.H ../FL/Fl_Input_.H +function_panel.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H ../FL/Fl_Group.H +function_panel.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H +function_panel.o: ../FL/fl_draw.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H +function_panel.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H +function_panel.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Box.H ../FL/Fl_Pixmap.H +function_panel.o: ../FL/Fl_Image.H Fl_Type.h ../FL/Fl_Widget.H +function_panel.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h +function_panel.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H ../FL/Fl_Pack.H +function_panel.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H +function_panel.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H Only in fltk-utf8-1.1.6/fluid: makedepend.bak Only in fltk-1.1.6/lib: README.lib diff -ur -- fltk-1.1.6/makeinclude.in fltk-utf8-1.1.6/makeinclude.in --- fltk-1.1.6/makeinclude.in 2004-10-18 21:22:21.000000000 +0100 +++ fltk-utf8-1.1.6/makeinclude.in 2005-06-28 15:45:41.000000000 +0100 @@ -20,7 +20,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. # -# Please report all bugs and problems to "fltk-bugs@fltk.org". +# Please report all bugs and problems to "fltk-uf8-bugs@fltk-uf8.org". # prefix = @prefix@ @@ -64,6 +64,7 @@ LIBEXT = @LIBEXT@ RANLIB = @RANLIB@ DSONAME = @DSONAME@ +XDSONAME = @XDSONAME@ FLDSONAME = @FLDSONAME@ GLDSONAME = @GLDSONAME@ IMGDSONAME = @IMGDSONAME@ @@ -74,8 +75,8 @@ GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@ LINKFLTK = -L../lib @LINKFLTK@ LINKFLTKGL = -L../lib @LINKFLTKGL@ -LINKFLTKFORMS = -L../lib -lfltk_forms @LINKFLTK@ -LINKFLTKIMG = -L../lib -lfltk_images @LINKFLTK@ $(IMAGELIBS) +LINKFLTKFORMS = -L../lib -lfltk-utf8_forms @LINKFLTK@ +LINKFLTKIMG = -L../lib -lfltk-utf8_images @LINKFLTK@ $(IMAGELIBS) LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) IMAGELIBS = @IMAGELIBS@ diff -ur -- fltk-1.1.6/src/Fl.cxx fltk-utf8-1.1.6/src/Fl.cxx --- fltk-1.1.6/src/Fl.cxx 2004-11-23 19:50:58.000000000 +0000 +++ fltk-utf8-1.1.6/src/Fl.cxx 2005-06-12 19:06:26.000000000 +0100 @@ -64,7 +64,9 @@ char *Fl::e_text = (char *)""; int Fl::e_length; int Fl::visible_focus_ = 1, - Fl::dnd_text_ops_ = 1; + Fl::dnd_text_ops_ = 0, + Fl::symbol_in_label_ = 0; + // diff -ur -- fltk-1.1.6/src/Fl_Browser_load.cxx fltk-utf8-1.1.6/src/Fl_Browser_load.cxx --- fltk-1.1.6/src/Fl_Browser_load.cxx 2004-04-11 05:38:57.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Browser_load.cxx 2005-06-12 19:06:26.000000000 +0100 @@ -26,6 +26,7 @@ #include #include #include +#include int Fl_Browser::load(const char *filename) { #define MAXFL_BLINE 1024 @@ -34,7 +35,7 @@ int i; clear(); if (!filename || !(filename[0])) return 1; - FILE *fl = fopen(filename,"r"); + FILE *fl = fl_fopen(filename,"r"); if (!fl) return 0; i = 0; do { diff -ur -- fltk-1.1.6/src/Fl_Color_Chooser.cxx fltk-utf8-1.1.6/src/Fl_Color_Chooser.cxx --- fltk-1.1.6/src/Fl_Color_Chooser.cxx 2004-07-27 17:02:20.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Color_Chooser.cxx 2005-06-12 19:06:26.000000000 +0100 @@ -472,19 +472,16 @@ v->damage(FL_DAMAGE_EXPOSE); } -extern const char* fl_ok; -extern const char* fl_cancel; - int fl_color_chooser(const char* name, double& r, double& g, double& b) { Fl_Window window(215,200,name); Fl_Color_Chooser chooser(10, 10, 195, 115); ColorChip ok_color(10, 130, 95, 25); - Fl_Return_Button ok_button(10, 165, 95, 25, fl_ok); + Fl_Return_Button ok_button(10, 165, 95, 25, Fl::txt_ok); ColorChip cancel_color(110, 130, 95, 25); cancel_color.r = uchar(255*r+.5); ok_color.r = cancel_color.r; ok_color.g = cancel_color.g = uchar(255*g+.5); ok_color.b = cancel_color.b = uchar(255*b+.5); - Fl_Button cancel_button(110, 165, 95, 25, fl_cancel); + Fl_Button cancel_button(110, 165, 95, 25, Fl::txt_cancel); window.resizable(chooser); chooser.rgb(r,g,b); chooser.callback(chooser_cb, &ok_color); diff -ur -- fltk-1.1.6/src/Fl_File_Browser.cxx fltk-utf8-1.1.6/src/Fl_File_Browser.cxx --- fltk-1.1.6/src/Fl_File_Browser.cxx 2004-04-11 05:38:57.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_File_Browser.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -39,6 +39,7 @@ #include #include +#include #include #include #include @@ -529,13 +530,13 @@ // Open the file that contains a list of mounted filesystems... // - mtab = fopen("/etc/mnttab", "r"); // Fairly standard + mtab = fl_fopen("/etc/mnttab", "r"); // Fairly standard if (mtab == NULL) - mtab = fopen("/etc/mtab", "r"); // More standard + mtab = fl_fopen("/etc/mtab", "r"); // More standard if (mtab == NULL) - mtab = fopen("/etc/fstab", "r"); // Otherwise fallback to full list + mtab = fl_fopen("/etc/fstab", "r"); // Otherwise fallback to full list if (mtab == NULL) - mtab = fopen("/etc/vfstab", "r"); // Alternate full list file + mtab = fl_fopen("/etc/vfstab", "r"); // Alternate full list file if (mtab != NULL) { diff -ur -- fltk-1.1.6/src/Fl_File_Chooser.cxx fltk-utf8-1.1.6/src/Fl_File_Chooser.cxx --- fltk-1.1.6/src/Fl_File_Chooser.cxx 2004-04-06 20:33:11.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_File_Chooser.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -2,6 +2,14 @@ #include "../FL/Fl_File_Chooser.H" +const char *Fl::txt_choose_file = "Choose File"; +const char *Fl::txt_show = "Show"; +const char *Fl::txt_favorites = "Favorites"; +const char *Fl::txt_preview = "Preview"; +const char *Fl::txt_file_name = "Filename:"; +const char *Fl::txt_manage_favorites = "Manage Favorites"; + + inline void Fl_File_Chooser::cb_window_i(Fl_Double_Window*, void*) { fileName->value(""); fileList->deselect(); @@ -132,17 +140,17 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char *title) { Fl_Double_Window* w; - { Fl_Double_Window* o = window = new Fl_Double_Window(490, 380, "Choose File"); + { Fl_Double_Window* o = window = new Fl_Double_Window(490, 380, Fl::txt_choose_file); w = o; o->callback((Fl_Callback*)cb_window, (void*)(this)); { Fl_Group* o = new Fl_Group(65, 10, 415, 25); - { Fl_Choice* o = showChoice = new Fl_Choice(65, 10, 215, 25, "Show:"); + { Fl_Choice* o = showChoice = new Fl_Choice(65, 10, 215, 25, Fl::txt_show); o->down_box(FL_BORDER_BOX); o->callback((Fl_Callback*)cb_showChoice); Fl_Group::current()->resizable(o); showChoice->label(show_label); } - { Fl_Menu_Button* o = favoritesButton = new Fl_Menu_Button(290, 10, 155, 25, "Favorites"); + { Fl_Menu_Button* o = favoritesButton = new Fl_Menu_Button(290, 10, 155, 25, Fl::txt_favorites); o->down_box(FL_BORDER_BOX); o->callback((Fl_Callback*)cb_favoritesButton); o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); @@ -173,7 +181,7 @@ } { Fl_Group* o = new Fl_Group(0, 275, 480, 95); { Fl_Group* o = new Fl_Group(10, 275, 470, 20); - { Fl_Check_Button* o = previewButton = new Fl_Check_Button(10, 275, 170, 20, "Preview"); + { Fl_Check_Button* o = previewButton = new Fl_Check_Button(10, 275, 170, 20, Fl::txt_preview); o->down_box(FL_DOWN_BOX); o->value(1); o->shortcut(0x80070); @@ -191,18 +199,18 @@ Fl_Group::current()->resizable(o); fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY_ALWAYS); } - { Fl_Box* o = new Fl_Box(10, 310, 105, 25, "Filename:"); + { Fl_Box* o = new Fl_Box(10, 310, 105, 25, Fl::txt_file_name); o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE); o->label(filename_label); } { Fl_Group* o = new Fl_Group(10, 345, 470, 25); - { Fl_Return_Button* o = okButton = new Fl_Return_Button(300, 345, 85, 25, "OK"); + { Fl_Return_Button* o = okButton = new Fl_Return_Button(300, 345, 85, 25, Fl::txt_ok); o->callback((Fl_Callback*)cb_okButton); - okButton->label(fl_ok); + okButton->label(Fl::txt_ok); } - { Fl_Button* o = new Fl_Button(395, 345, 85, 25, "Cancel"); + { Fl_Button* o = new Fl_Button(395, 345, 85, 25, Fl::txt_cancel); o->callback((Fl_Callback*)cb_Cancel); - o->label(fl_cancel); + o->label(Fl::txt_cancel); } { Fl_Box* o = new Fl_Box(10, 345, 300, 25); Fl_Group::current()->resizable(o); @@ -215,7 +223,7 @@ o->set_modal(); o->end(); } - { Fl_Double_Window* o = favWindow = new Fl_Double_Window(355, 150, "Manage Favorites"); + { Fl_Double_Window* o = favWindow = new Fl_Double_Window(355, 150, Fl::txt_manage_favorites); w = o; o->user_data((void*)(this)); { Fl_File_Browser* o = favList = new Fl_File_Browser(10, 10, 300, 95); @@ -232,13 +240,13 @@ { Fl_Button* o = favDownButton = new Fl_Button(320, 80, 25, 25, "@2>"); o->callback((Fl_Callback*)cb_favDownButton); } - { Fl_Button* o = favCancelButton = new Fl_Button(270, 115, 75, 25, "Cancel"); + { Fl_Button* o = favCancelButton = new Fl_Button(270, 115, 75, 25, Fl::txt_cancel); o->callback((Fl_Callback*)cb_favCancelButton); - favCancelButton->label(fl_cancel); + favCancelButton->label(Fl::txt_cancel); } - { Fl_Return_Button* o = favOkButton = new Fl_Return_Button(185, 115, 75, 25, "OK"); + { Fl_Return_Button* o = favOkButton = new Fl_Return_Button(185, 115, 75, 25, Fl::txt_ok); o->callback((Fl_Callback*)cb_favOkButton); - favOkButton->label(fl_ok); + favOkButton->label(Fl::txt_ok); } favWindow->label(manage_favorites_label); o->set_modal(); @@ -254,7 +262,7 @@ value(d); type(t); int e; -prefs_.get("preview", e, 1); +prefs_.get("preview", e, 0); preview(e); } diff -ur -- fltk-1.1.6/src/Fl_File_Chooser2.cxx fltk-utf8-1.1.6/src/Fl_File_Chooser2.cxx --- fltk-1.1.6/src/Fl_File_Chooser2.cxx 2004-09-07 21:59:16.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_File_Chooser2.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -51,6 +51,7 @@ #include #include +#include #include "flstring.h" #include #include @@ -74,7 +75,7 @@ // File chooser label strings and sort function... // -Fl_Preferences Fl_File_Chooser::prefs_(Fl_Preferences::USER, "fltk.org", "filechooser"); +Fl_Preferences Fl_File_Chooser::prefs_(Fl_Preferences::USER, "oksid.ch", "filechooser"); const char *Fl_File_Chooser::add_favorites_label = "Add to Favorites"; const char *Fl_File_Chooser::all_files_label = "All Files (*)"; @@ -217,7 +218,7 @@ if (!v) { // Add current directory to favorites... - if (getenv("HOME")) v = favoritesButton->size() - 5; + if (fl_getenv("HOME")) v = favoritesButton->size() - 5; else v = favoritesButton->size() - 4; sprintf(menuname, "favorite%02d", v); @@ -499,7 +500,7 @@ if (fl_filename_isdir(pathname)) { #endif /* WIN32 || __EMX__ */ directory(pathname); - } else if ((type_ & CREATE) || access(pathname, 0) == 0) { + } else if ((type_ & CREATE) || fl_access(pathname, 0) == 0) { // New file or file exists... If we are in multiple selection mode, // switch to single selection mode... if (type_ & MULTI) @@ -623,7 +624,7 @@ } // See if we need to enable the OK button... - if (((type_ & CREATE) || !access(fileName->value(), 0)) && + if (((type_ & CREATE) || !fl_access(fileName->value(), 0)) && (!fl_filename_isdir(fileName->value()) || (type_ & DIRECTORY))) { okButton->activate(); } else { @@ -718,14 +719,16 @@ // Create the directory; ignore EEXIST errors... #if defined(WIN32) && ! defined (__CYGWIN__) - if (mkdir(pathname)) + if (fl_mkdir(pathname, 0777)) #else - if (mkdir(pathname, 0777)) + if (fl_mkdir(pathname, 0777)) #endif /* WIN32 */ if (errno != EEXIST) { - fl_alert("%s", strerror(errno)); - return; + if (fl_access(pathname, 0)) { + fl_alert("%s", strerror(errno)); + return; + } } // Show the new directory... @@ -858,7 +861,7 @@ favoritesButton->add(manage_favorites_label, FL_ALT + 'm', 0, 0, FL_MENU_DIVIDER); favoritesButton->add(filesystems_label, FL_ALT + 'f', 0); - if ((home = getenv("HOME")) != NULL) { + if ((home = fl_getenv("HOME")) != NULL) { quote_pathname(menuname, home, sizeof(menuname)); favoritesButton->add(menuname, FL_ALT + 'h', 0); } @@ -918,7 +921,7 @@ int bytes; char *ptr; - if (filename) fp = fopen(filename, "rb"); + if (filename) fp = fl_fopen(filename, "rb"); else fp = NULL; if (fp != NULL) { @@ -961,6 +964,7 @@ pbw = previewBox->w() - 20; pbh = previewBox->h() - 20; + if (image->w() < 1 || image->h() < 1) return; if (image->w() > pbw || image->h() > pbh) { w = pbw; h = w * image->h() / image->w(); diff -ur -- fltk-1.1.6/src/Fl_File_Icon.cxx fltk-utf8-1.1.6/src/Fl_File_Icon.cxx --- fltk-1.1.6/src/Fl_File_Icon.cxx 2004-06-14 16:58:52.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_File_Icon.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -41,6 +41,7 @@ #include #include +#include #include "flstring.h" #include #include @@ -199,7 +200,7 @@ else filetype = PLAIN; #else - if (!stat(filename, &fileinfo)) + if (!fl_stat(filename, &fileinfo)) { if (S_ISDIR(fileinfo.st_mode)) filetype = DIRECTORY; diff -ur -- fltk-1.1.6/src/Fl_File_Icon2.cxx fltk-utf8-1.1.6/src/Fl_File_Icon2.cxx --- fltk-1.1.6/src/Fl_File_Icon2.cxx 2004-02-29 12:47:36.000000000 +0000 +++ fltk-utf8-1.1.6/src/Fl_File_Icon2.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -37,6 +37,7 @@ #include #include +#include #include "flstring.h" #include #include @@ -86,6 +87,14 @@ static const char *kdedir = NULL; +const char* Fl::txt_unable_to_load_icon = "Fl_File_Icon::load(): Unable to load icon file \"%s\"."; +const char* Fl::txt_unable_to_open_fti = "Fl_File_Icon::load_fti(): Unable to open \"%s\" - %s"; +const char* Fl::txt_expected_letter_fti = "Fl_File_Icon::load_fti(): Expected a letter at file position %ld (saw '%c')"; +const char* Fl::txt_expected_a_fti = "Fl_File_Icon::load_fti(): Expected a ( at file position %ld (saw '%c')"; +const char* Fl::txt_expected_b_fti = "Fl_File_Icon::load_fti(): Expected a ) at file position %ld (saw '%c')"; +const char* Fl::txt_expected_c_fti = "Fl_File_Icon::load_fti(): Expected a ; at file position %ld (saw '%c')"; +const char* Fl::txt_unknown_command_fti = "Fl_File_Icon::load_fti(): Unknown command \"%s\" at file position %ld."; + // // 'Fl_File_Icon::load()' - Load an icon file... @@ -107,7 +116,7 @@ if (i) { - Fl::warning("Fl_File_Icon::load(): Unable to load icon file \"%s\".", f); + Fl::warning(Fl::txt_unable_to_load_icon, f); return; } } @@ -129,9 +138,9 @@ // Try to open the file... - if ((fp = fopen(fti, "rb")) == NULL) + if ((fp = fl_fopen(fti, "rb")) == NULL) { - Fl::error("Fl_File_Icon::load_fti(): Unable to open \"%s\" - %s", + Fl::error(Fl::txt_unable_to_open_fti, fti, strerror(errno)); return -1; } @@ -161,7 +170,7 @@ // OK, this character better be a letter... if (!isalpha(ch)) { - Fl::error("Fl_File_Icon::load_fti(): Expected a letter at file position %ld (saw '%c')", + Fl::error(Fl::txt_expected_letter_fti, ftell(fp) - 1, ch); break; } @@ -183,7 +192,7 @@ // Make sure we stopped on a parenthesis... if (ch != '(') { - Fl::error("Fl_File_Icon::load_fti(): Expected a ( at file position %ld (saw '%c')", + Fl::error(Fl::txt_expected_a_fti, ftell(fp) - 1, ch); break; } @@ -204,7 +213,7 @@ // Make sure we stopped on a parenthesis... if (ch != ')') { - Fl::error("Fl_File_Icon::load_fti(): Expected a ) at file position %ld (saw '%c')", + Fl::error(Fl::txt_expected_b_fti, ftell(fp) - 1, ch); break; } @@ -212,7 +221,7 @@ // Make sure the next character is a semicolon... if ((ch = getc(fp)) != ';') { - Fl::error("Fl_File_Icon::load_fti(): Expected a ; at file position %ld (saw '%c')", + Fl::error(Fl::txt_expected_c_fti, ftell(fp) - 1, ch); break; } @@ -311,7 +320,7 @@ } else { - Fl::error("Fl_File_Icon::load_fti(): Unknown command \"%s\" at file position %ld.", + Fl::error(Fl::txt_unknown_command_fti, command, ftell(fp) - 1); break; } @@ -670,11 +679,11 @@ if (!kdedir) { // Figure out where KDE is installed... - if ((kdedir = getenv("KDEDIR")) == NULL) + if ((kdedir = fl_getenv("KDEDIR")) == NULL) { - if (!access("/opt/kde", F_OK)) + if (!fl_access("/opt/kde", F_OK)) kdedir = "/opt/kde"; - else if (!access("/usr/local/share/mimelnk", F_OK)) + else if (!fl_access("/usr/local/share/mimelnk", F_OK)) kdedir = "/usr/local"; else kdedir = "/usr"; @@ -704,7 +713,7 @@ snprintf(filename, sizeof(filename), "%s/share/icons/unknown.xpm", kdedir); - if (!access(filename, F_OK)) + if (!fl_access(filename, F_OK)) icon->load_image(filename); icon = new Fl_File_Icon("*", Fl_File_Icon::LINK); @@ -712,13 +721,13 @@ snprintf(filename, sizeof(filename), "%s/16x16/filesystems/link.png", icondir); - if (!access(filename, F_OK)) + if (!fl_access(filename, F_OK)) icon->load_image(filename); snprintf(filename, sizeof(filename), "%s/share/mimelnk", kdedir); load_kde_icons(filename, icondir); } - else if (!access("/usr/share/icons/folder.xpm", F_OK)) + else if (!fl_access("/usr/share/icons/folder.xpm", F_OK)) { // Load GNOME icons... icon = new Fl_File_Icon("*", Fl_File_Icon::PLAIN); @@ -727,7 +736,7 @@ icon = new Fl_File_Icon("*", Fl_File_Icon::DIRECTORY); icon->load_image("/usr/share/icons/folder.xpm"); } - else if (!access("/usr/dt/appconfig/icons", F_OK)) + else if (!fl_access("/usr/dt/appconfig/icons", F_OK)) { // Load CDE icons... icon = new Fl_File_Icon("*", Fl_File_Icon::PLAIN); @@ -748,7 +757,7 @@ icon = new Fl_File_Icon("*.ppd", Fl_File_Icon::PLAIN); icon->load_image("/usr/dt/appconfig/icons/C/DtPrtpr.m.pm"); } - else if (!access("/usr/lib/filetype", F_OK)) + else if (!fl_access("/usr/lib/filetype", F_OK)) { // Load SGI icons... icon = new Fl_File_Icon("*", Fl_File_Icon::PLAIN); @@ -763,7 +772,7 @@ icon = new Fl_File_Icon("*.{bmp|bw|gif|jpg|pbm|pcd|pgm|ppm|png|ras|rgb|tif|xbm|xpm}", Fl_File_Icon::PLAIN); icon->load_fti("/usr/lib/filetype/system/iconlib/ImageFile.fti"); - if (!access("/usr/lib/filetype/install/iconlib/acroread.doc.fti", F_OK)) + if (!fl_access("/usr/lib/filetype/install/iconlib/acroread.doc.fti", F_OK)) { icon = new Fl_File_Icon("*.{eps|ps}", Fl_File_Icon::PLAIN); icon->load_fti("/usr/lib/filetype/system/iconlib/PostScriptFile.closed.fti"); @@ -777,14 +786,14 @@ icon->load_fti("/usr/lib/filetype/system/iconlib/PostScriptFile.closed.fti"); } - if (!access("/usr/lib/filetype/install/iconlib/html.fti", F_OK)) + if (!fl_access("/usr/lib/filetype/install/iconlib/html.fti", F_OK)) { icon = new Fl_File_Icon("*.{htm|html|shtml}", Fl_File_Icon::PLAIN); icon->load_fti("/usr/lib/filetype/iconlib/generic.doc.fti"); icon->load_fti("/usr/lib/filetype/install/iconlib/html.fti"); } - if (!access("/usr/lib/filetype/install/iconlib/color.ps.idle.fti", F_OK)) + if (!fl_access("/usr/lib/filetype/install/iconlib/color.ps.idle.fti", F_OK)) { icon = new Fl_File_Icon("*.ppd", Fl_File_Icon::PLAIN); icon->load_fti("/usr/lib/filetype/install/iconlib/color.ps.idle.fti"); @@ -863,7 +872,7 @@ pattern[0] = '\0'; iconfilename[0] = '\0'; - if ((fp = fopen(filename, "rb")) != NULL) + if ((fp = fl_fopen(filename, "rb")) != NULL) { while (fgets(tmp, sizeof(tmp), fp)) { @@ -879,7 +888,7 @@ if (iconfilename[0] && (pattern[0] || strncmp(mimetype, "inode/", 6) == 0)) { - if (!access(icondir, F_OK)) + if (!fl_access(icondir, F_OK)) { // KDE 3.x and 2.x icons int i; // Looping var @@ -943,7 +952,7 @@ snprintf(full_iconfilename, sizeof(full_iconfilename), "%s/%s/%s.png", icondir, paths[i], iconfilename); - if (!access(full_iconfilename, F_OK)) break; + if (!fl_access(full_iconfilename, F_OK)) break; } if (i >= (int)(sizeof(paths) / sizeof(paths[0]))) return; @@ -952,7 +961,7 @@ snprintf(full_iconfilename, sizeof(full_iconfilename), "%s/%s", tmp, iconfilename); - if (access(full_iconfilename, F_OK)) return; + if (fl_access(full_iconfilename, F_OK)) return; } if (strncmp(mimetype, "inode/", 6) == 0) { diff -ur -- fltk-1.1.6/src/Fl_Font.H fltk-utf8-1.1.6/src/Fl_Font.H --- fltk-1.1.6/src/Fl_Font.H 2004-09-09 01:55:41.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Font.H 2005-06-12 19:06:27.000000000 +0100 @@ -40,6 +40,8 @@ # if USE_XFT typedef struct _XftFont XftFont; +# elif !defined(WIN32) && !defined(__APPLE__) +# include # endif // USE_XFT class Fl_FontSize { @@ -47,7 +49,7 @@ Fl_FontSize *next; // linked list for this Fl_Fontdesc # ifdef WIN32 HFONT fid; - int width[256]; + int *width[64]; TEXTMETRIC metr; FL_EXPORT Fl_FontSize(const char* fontname, int size); # elif defined(__APPLE_QD__) @@ -67,13 +69,14 @@ int size; FL_EXPORT Fl_FontSize(const char* xfontname); # else - XFontStruct* font; // X font information + XUtf8FontStruct* font; // X UTF-8 font information FL_EXPORT Fl_FontSize(const char* xfontname); # endif int minsize; // smallest point size that should use this int maxsize; // largest point size that should use this # if HAVE_GL unsigned int listbase;// base of display list, 0 = none + char glok[64]; # endif FL_EXPORT ~Fl_FontSize(); }; diff -ur -- fltk-1.1.6/src/Fl_GIF_Image.cxx fltk-utf8-1.1.6/src/Fl_GIF_Image.cxx --- fltk-1.1.6/src/Fl_GIF_Image.cxx 2004-04-11 05:38:57.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_GIF_Image.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -34,6 +34,7 @@ #include #include #include +#include #include "flstring.h" // Read a .gif file and convert it to a "xpm" format (actually my @@ -76,12 +77,21 @@ #define NEXTBYTE (uchar)getc(GifFile) #define GETSHORT(var) var = NEXTBYTE; var += NEXTBYTE << 8 +const char* Fl::txt_gif_unable_to_open = "Fl_GIF_Image: Unable to open %s!"; +const char* Fl::txt_gif_is_not_gif = "Fl_GIF_Image: %s is not a GIF file.\n"; +const char* Fl::txt_gif_is_version = "%s is version %c%c%c."; +const char* Fl::txt_gif_no_colormap = "%s does not have a colormap."; +const char* Fl::txt_gif_unexpected_eof = "Fl_GIF_Image: %s - unexpected EOF"; +const char* Fl::txt_gif_unknown_extension = "%s: unknown gif extension 0x%02x."; +const char* Fl::txt_gif_unknown_code = "%s: unknown gif code 0x%02x"; +const char* Fl::txt_gif_lzw_barf = "Fl_GIF_Image: %s - LZW Barf!"; + Fl_GIF_Image::Fl_GIF_Image(const char *infname) : Fl_Pixmap((char *const*)0) { FILE *GifFile; // File to read char **new_data; // Data array - if ((GifFile = fopen(infname, "rb")) == NULL) { - Fl::error("Fl_GIF_Image: Unable to open %s!", infname); + if ((GifFile = fl_fopen(infname, "rb")) == NULL) { + Fl::error(Fl::txt_gif_unable_to_open, infname); return; } @@ -92,11 +102,11 @@ } if (b[0]!='G' || b[1]!='I' || b[2] != 'F') { fclose(GifFile); - Fl::error("Fl_GIF_Image: %s is not a GIF file.\n", infname); + Fl::error(Fl::txt_gif_is_not_gif, infname); return; } if (b[3]!='8' || b[4]>'9' || b[5]!= 'a') - Fl::warning("%s is version %c%c%c.",infname,b[3],b[4],b[5]); + Fl::warning(Fl::txt_gif_is_version,infname,b[3],b[4],b[5]); } int Width; GETSHORT(Width); @@ -122,7 +132,7 @@ Blue[i] = NEXTBYTE; } } else { - Fl::warning("%s does not have a colormap.", infname); + Fl::warning(Fl::txt_gif_no_colormap, infname); for (int i = 0; i < ColorMapSize; i++) Red[i] = Green[i] = Blue[i] = (uchar)(255 * i / (ColorMapSize-1)); } @@ -135,7 +145,7 @@ int i = NEXTBYTE; if (i<0) { fclose(GifFile); - Fl::error("Fl_GIF_Image: %s - unexpected EOF",infname); + Fl::error(Fl::txt_gif_unexpected_eof,infname); return; } int blocklen; @@ -160,7 +170,7 @@ ; } else if (ch != 0xFE) { //Gif Comment - Fl::warning("%s: unknown gif extension 0x%02x.", infname, ch); + Fl::warning(Fl::txt_gif_unknown_extension, infname, ch); } } else if (i == 0x2c) { // an image @@ -184,7 +194,7 @@ break; // okay, this is the image we want } else { - Fl::warning("%s: unknown gif code 0x%02x", infname, i); + Fl::warning(Fl::txt_gif_unknown_code, infname, i); blocklen = 0; } @@ -257,7 +267,7 @@ int i; if (CurCode < FreeCode) i = CurCode; else if (CurCode == FreeCode) {*tp++ = (uchar)FinChar; i = OldCode;} - else {Fl::error("Fl_GIF_Image: %s - LZW Barf!", infname); break;} + else {Fl::error(Fl::txt_gif_lzw_barf, infname); break;} while (i >= ColorMapSize) {*tp++ = Suffix[i]; i = Prefix[i];} *tp++ = FinChar = i; diff -ur -- fltk-1.1.6/src/Fl_Gl_Choice.cxx fltk-utf8-1.1.6/src/Fl_Gl_Choice.cxx --- fltk-1.1.6/src/Fl_Gl_Choice.cxx 2004-09-24 17:00:10.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Gl_Choice.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -32,6 +32,7 @@ # include "Fl_Gl_Choice.H" # include # include "flstring.h" +# include # ifdef __APPLE__ # include @@ -265,7 +266,7 @@ if (/*MaxCmapsOfScreen(ScreenOfDisplay(fl_display,fl_screen))==1 && */ visp->visualid == fl_visual->visualid && - !getenv("MESA_PRIVATE_CMAP")) + !fl_getenv("MESA_PRIVATE_CMAP")) g->colormap = fl_colormap; else g->colormap = XCreateColormap(fl_display, RootWindow(fl_display,fl_screen), diff -ur -- fltk-1.1.6/src/Fl_Gl_Window.cxx fltk-utf8-1.1.6/src/Fl_Gl_Window.cxx --- fltk-1.1.6/src/Fl_Gl_Window.cxx 2004-09-09 22:34:46.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Gl_Window.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -31,6 +31,7 @@ #include "Fl_Gl_Choice.H" #include #include +#include //////////////////////////////////////////////////////////////// @@ -274,7 +275,7 @@ #else SWAP_TYPE = UNDEFINED; #endif - const char* c = getenv("GL_SWAP_TYPE"); + const char* c = fl_getenv("GL_SWAP_TYPE"); if (c) { if (!strcmp(c,"COPY")) SWAP_TYPE = COPY; else if (!strcmp(c, "NODAMAGE")) SWAP_TYPE = NODAMAGE; diff -ur -- fltk-1.1.6/src/Fl_Group.cxx fltk-utf8-1.1.6/src/Fl_Group.cxx --- fltk-1.1.6/src/Fl_Group.cxx 2004-10-18 21:22:22.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Group.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -413,9 +413,9 @@ delete[] sizes_; sizes_ = 0; } -short* Fl_Group::sizes() { +int* Fl_Group::sizes() { if (!sizes_) { - short* p = sizes_ = new short[4*(children_+2)]; + int* p = sizes_ = new int[4*(children_+2)]; // first thing in sizes array is the group's size: if (type() < FL_WINDOW) {p[0] = x(); p[2] = y();} else {p[0] = p[2] = 0;} p[1] = p[0]+w(); p[3] = p[2]+h(); @@ -462,7 +462,7 @@ } else if (children_) { - short* p = sizes(); + int* p = sizes(); // get changes in size/position from the initial size: int dx = X - p[0]; diff -ur -- fltk-1.1.6/src/Fl_Help_Dialog.cxx fltk-utf8-1.1.6/src/Fl_Help_Dialog.cxx --- fltk-1.1.6/src/Fl_Help_Dialog.cxx 2004-07-04 07:49:33.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Help_Dialog.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -4,6 +4,14 @@ #include "flstring.h" #include +const char* Fl::txt_show_previous_help_page = "Show the previous help page."; +const char* Fl::txt_make_the_help_text_smaller = "Make the help text smaller."; +const char* Fl::txt_show_next_help_page = "Show the next help page."; +const char* Fl::txt_make_the_help_text_larger = "Make the help text larger."; +const char* Fl::txt_help_dialog = "Help Dialog"; +const char* Fl::txt_at_search = "@search"; +const char* Fl::txt_find_text = "find text in document"; + inline void Fl_Help_Dialog::cb_view__i(Fl_Help_View*, void*) { if (view_->changed()) { @@ -119,7 +127,7 @@ Fl_Help_Dialog::Fl_Help_Dialog() { Fl_Double_Window* w; - { Fl_Double_Window* o = window_ = new Fl_Double_Window(530, 385, "Help Dialog"); + { Fl_Double_Window* o = window_ = new Fl_Double_Window(530, 385, Fl::txt_help_dialog); w = o; o->user_data((void*)(this)); { Fl_Help_View* o = view_ = new Fl_Help_View(10, 10, 510, 330); @@ -136,30 +144,30 @@ o->end(); Fl_Group::current()->resizable(o); } - { Fl_Button* o = new Fl_Button(425, 350, 95, 25, "Close"); + { Fl_Button* o = new Fl_Button(425, 350, 95, 25, Fl::txt_close); o->callback((Fl_Callback*)cb_Close); - o->label(fl_close); + o->label(Fl::txt_close); } { Fl_Button* o = back_ = new Fl_Button(355, 350, 25, 25, "@<-"); - o->tooltip("Show the previous help page."); + o->tooltip(Fl::txt_show_previous_help_page); o->shortcut(0xff51); o->labelcolor((Fl_Color)2); o->callback((Fl_Callback*)cb_back_); } { Fl_Button* o = forward_ = new Fl_Button(390, 350, 25, 25, "@->"); - o->tooltip("Show the next help page."); + o->tooltip(Fl::txt_show_next_help_page); o->shortcut(0xff53); o->labelcolor((Fl_Color)2); o->callback((Fl_Callback*)cb_forward_); } { Fl_Button* o = smaller_ = new Fl_Button(285, 350, 25, 25, "F"); - o->tooltip("Make the help text smaller."); + o->tooltip(Fl::txt_make_the_help_text_smaller); o->labelfont(1); o->labelsize(10); o->callback((Fl_Callback*)cb_smaller_); } { Fl_Button* o = larger_ = new Fl_Button(320, 350, 25, 25, "F"); - o->tooltip("Make the help text larger."); + o->tooltip(Fl::txt_make_the_help_text_larger); o->labelfont(1); o->labelsize(16); o->callback((Fl_Callback*)cb_larger_); @@ -167,8 +175,8 @@ { Fl_Group* o = new Fl_Group(10, 350, 265, 25); o->box(FL_DOWN_BOX); o->color(FL_BACKGROUND2_COLOR); - { Fl_Input* o = find_ = new Fl_Input(35, 352, 238, 21, "@search"); - o->tooltip("find text in document"); + { Fl_Input* o = find_ = new Fl_Input(35, 352, 238, 21, Fl::txt_at_search); + o->tooltip(Fl::txt_find_text); o->box(FL_FLAT_BOX); o->labelsize(13); o->callback((Fl_Callback*)cb_find_); diff -ur -- fltk-1.1.6/src/Fl_Help_View.cxx fltk-utf8-1.1.6/src/Fl_Help_View.cxx --- fltk-1.1.6/src/Fl_Help_View.cxx 2004-09-24 17:00:10.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Help_View.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -56,6 +56,7 @@ #include #include #include +#include #include "flstring.h" #include #include @@ -546,7 +547,10 @@ if (strcasecmp(buf, "LI") == 0) { fl_font(FL_SYMBOL, fsize); - fl_draw("\267", xx - fsize + x() - leftline_, yy + y()); + char buf[8]; + xchar b[] = {0x2022, 0x0}; + buf[fl_unicode2utf(b, 1, buf)] = 0; + fl_draw(buf, xx - fsize + x() - leftline_, yy + y()); } pushfont(font, fsize); @@ -723,7 +727,10 @@ if (qch < 0) *s++ = '&'; else { - *s++ = qch; + int l; + l = fl_ucs2utf((unsigned int) qch, s); + if (l < 1) l = 1; + s += l; ptr = strchr(ptr, ';') + 1; } @@ -1489,7 +1496,10 @@ if (qch < 0) *s++ = '&'; else { - *s++ = qch; + int l; + l = fl_ucs2utf((unsigned int) qch, s); + if (l < 1) l = 1; + s += l; ptr = strchr(ptr, ';') + 1; } @@ -1915,7 +1925,10 @@ if (qch < 0) *s++ = '&'; else { - *s++ = qch; + int l; + l = fl_ucs2utf((unsigned int) qch, s); + if (l < 1) l = 1; + s += l; ptr = strchr(ptr, ';') + 1; } } @@ -2209,7 +2222,7 @@ } else if (name[0] != '/' && strchr(name, ':') == NULL) { if (directory_[0]) snprintf(temp, sizeof(temp), "%s/%s", directory_, name); else { - getcwd(dir, sizeof(dir)); + fl_getcwd(dir, sizeof(dir)); snprintf(temp, sizeof(temp), "file:%s/%s", dir, name); } @@ -2333,7 +2346,7 @@ snprintf(temp, sizeof(temp), "%s/%s", directory_, linkp->filename); else { - getcwd(dir, sizeof(dir)); + fl_getcwd(dir, sizeof(dir)); snprintf(temp, sizeof(temp), "file:%s/%s", dir, linkp->filename); } } @@ -2502,7 +2515,7 @@ if (strncmp(localname, "file:", 5) == 0) localname += 5; // Adjust for local filename... - if ((fp = fopen(localname, "rb")) != NULL) + if ((fp = fl_fopen(localname, "rb")) != NULL) { fseek(fp, 0, SEEK_END); len = ftell(fp); diff -ur -- fltk-1.1.6/src/Fl_Image.cxx fltk-utf8-1.1.6/src/Fl_Image.cxx --- fltk-1.1.6/src/Fl_Image.cxx 2004-09-24 17:00:10.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Image.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -426,6 +426,39 @@ m->label(_FL_IMAGE_LABEL, (const char*)this); } +void Fl_RGB_Image::to_rgba(uchar *buf) +{ + int x, y; + const uchar *old_ptr; + uchar *new_ptr; + + if (!w() || !h() || !d() || !array) return; + + new_ptr = buf; + old_ptr = array; + for (y = 0; y < h(); ++y, old_ptr = array + y * w() * d() + ld(), new_ptr = buf + y * w() * 4) { + for (x = 0; x < w(); x++) { + uchar p = *(new_ptr++) = *(old_ptr++); + if (d() == 1) { + *(new_ptr++) = p; + *(new_ptr++) = p; + *(new_ptr++) = 255; // 255 is plain + } else if (d() == 2) { + *(new_ptr++) = p; + *(new_ptr++) = p; + *(new_ptr++) = *(old_ptr++); + } else if (d() == 3) { + *(new_ptr++) = *(old_ptr++); + *(new_ptr++) = *(old_ptr++); + *(new_ptr++) = 255; + } else { + *(new_ptr++) = *(old_ptr++); + *(new_ptr++) = *(old_ptr++); + *(new_ptr++) = *(old_ptr++); // 0 is transparent + } + } + } +} // // End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.38 2004/09/24 16:00:10 easysw Exp $". diff -ur -- fltk-1.1.6/src/Fl_Input_.cxx fltk-utf8-1.1.6/src/Fl_Input_.cxx --- fltk-1.1.6/src/Fl_Input_.cxx 2004-09-21 14:35:39.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Input_.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -34,6 +34,7 @@ #include #include #include +#include #include "flstring.h" #include #include @@ -55,9 +56,14 @@ int width_to_lastspace = 0; int word_count = 0; int word_wrap; + const char *pe = p + strlen(p); if (input_type()==FL_SECRET_INPUT) { - while (o= 1) *o++ = '*'; + p++; + } + } else while (o= value_+size_ || isspace(*p))) { word_wrap = w() - Fl::box_dw(box()) - 2; @@ -77,13 +83,13 @@ if (c < ' ' || c == 127) { if (c=='\n' && input_type()==FL_MULTILINE_INPUT) {p--; break;} if (c == '\t' && input_type()==FL_MULTILINE_INPUT) { - for (c = (o-buf)%8; c<8 && o= 1) n++; + p++; + } + } else while (p= 128 && c < 0xA0) { - n += 4; + if (c == '\t' && input_type()==FL_MULTILINE_INPUT) { + n += 8-(chr%8); + chr += 8-(chr%8); + } else n += 2; } else { n++; } + chr += fl_utflen((unsigned char*)p, e-p) >= 1; + p++; } if (returnn) *returnn = n; return fl_width(buf, n); @@ -322,6 +335,10 @@ } fl_pop_clip(); + if (Fl::focus() == this) { + fl_set_spot(textfont(), textsize(), + (int)xpos+curx, Y+ypos-fl_descent(), W, H); + } } static int isword(char c) { @@ -401,14 +418,20 @@ const char *l, *r, *t; double f0 = Fl::event_x()-X+xscroll_; for (l = p, r = e; l 0) { + f1 = X-xscroll_+expandpos(p, l + cw, buf, 0) - Fl::event_x(); + if (f1 < f0) l = l+cw; + } } newpos = l-value(); @@ -448,12 +471,33 @@ } int Fl_Input_::position(int p, int m) { + int is_same = 0; was_up_down = 0; if (p<0) p = 0; if (p>size()) p = size(); if (m<0) m = 0; if (m>size()) m = size(); + if (p == m) is_same = 1; + + while (p < position_ && p > 0 && (size() - p) > 0 && + (fl_utflen((unsigned char *)value() + p, size() - p) < 1)) { p--; } + int ul = fl_utflen((unsigned char *)value() + p, size() - p); + while (p < size() && p > position_ && ul < 0) { + p++; + ul = fl_utflen((unsigned char *)value() + p, size() - p); + } + + while (m < mark_ && m > 0 && (size() - m) > 0 && + (fl_utflen((unsigned char *)value() + m, size() - m) < 1)) { m--; } + ul = fl_utflen((unsigned char *)value() + m, size() - m); + while (m < size() && m > mark_ && ul < 0) { + m++; + ul = fl_utflen((unsigned char *)value() + m, size() - m); + } + if (is_same) m = p; if (p == position_ && m == mark_) return 0; + + //if (Fl::selection_owner() == this) Fl::selection_owner(0); if (p != m) { if (p != position_) minimal_update(position_, p); @@ -529,7 +573,7 @@ // all changes go through here, delete characters b-e and insert text: int Fl_Input_::replace(int b, int e, const char* text, int ilen) { - + int ul, om, op; was_up_down = 0; if (b<0) b = 0; @@ -537,6 +581,13 @@ if (b>size_) b = size_; if (e>size_) e = size_; if (e 0 && (size_ - b) > 0 && + (fl_utflen((unsigned char *)value_ + b, size_ - b) < 1)) { b--; } + ul = fl_utflen((unsigned char *)value_ + e, size_ - e); + while (e < size_ && e > 0 && ul < 0) { + e++; + ul = fl_utflen((unsigned char *)value_ + e, size_ - e ); + } if (text && !ilen) ilen = strlen(text); if (e<=b && !ilen) return 0; // don't clobber undo for a null operation if (size_+ilen-(e-b) > maximum_size_) { @@ -583,7 +634,9 @@ size_ += ilen; } undowidget = this; - undoat = b+ilen; + om = mark_; + op = position_; + mark_ = position_ = undoat = b+ilen; // Insertions into the word at the end of the line will cause it to // wrap to the next line, so we must indicate that the changes may start @@ -594,8 +647,8 @@ while (b > 0 && !isspace(index(b))) b--; // make sure we redraw the old selection or cursor: - if (mark_ < b) b = mark_; - if (position_ < b) b = position_; + if (om < b) b = om; + if (op < b) b = op; minimal_update(b); @@ -669,6 +722,7 @@ return 1; case FL_FOCUS: + fl_set_spot(textfont(), textsize(), x(), y(), w(), h()); if (mark_ == position_) { minimal_update(size()+1); } else //if (Fl::selection_owner() != this) @@ -681,6 +735,7 @@ } else //if (Fl::selection_owner() != this) minimal_update(mark_, position_); case FL_HIDE: + fl_reset_spot(); if (when() & FL_WHEN_RELEASE) maybe_do_callback(); return 1; @@ -698,7 +753,7 @@ return 1; case FL_RELEASE: - copy(0); + if (Fl::event_button() == 1) copy(0); return 1; case FL_PASTE: { diff -ur -- fltk-1.1.6/src/Fl_JPEG_Image.cxx fltk-utf8-1.1.6/src/Fl_JPEG_Image.cxx --- fltk-1.1.6/src/Fl_JPEG_Image.cxx 2004-04-11 05:38:57.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_JPEG_Image.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -36,7 +36,7 @@ #include #include #include - +#include // Some releases of the Cygwin JPEG libraries don't have a correctly // updated header file for the INT32 data type; the following define @@ -81,7 +81,7 @@ JSAMPROW row; // Sample row pointer - if ((fp = fopen(jpeg, "rb")) == NULL) return; + if ((fp = fl_fopen(jpeg, "rb")) == NULL) return; cinfo.err = jpeg_std_error(&jerr); jerr.error_exit = jpeg_error_handler; diff -ur -- fltk-1.1.6/src/Fl_Menu.cxx fltk-utf8-1.1.6/src/Fl_Menu.cxx --- fltk-1.1.6/src/Fl_Menu.cxx 2004-11-23 01:48:25.000000000 +0000 +++ fltk-utf8-1.1.6/src/Fl_Menu.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -204,15 +204,15 @@ fl_draw_box(FL_DOWN_BOX, x+2, y+d, W, W, FL_BACKGROUND2_COLOR); if (value()) { fl_color(labelcolor_); - int tx = x + 5; - int tw = W - 6; - int d1 = tw/3; - int d2 = tw-d1; - int ty = y + d + (W+d2)/2-d1-2; - for (int n = 0; n < 3; n++, ty++) { - fl_line(tx, ty, tx+d1, ty+d1); - fl_line(tx+d1, ty+d1, tx+tw-1, ty+d1-d2+1); - } + int tx = x + 5; + int tw = W - 6; + int d1 = tw/3; + int d2 = tw-d1; + int ty = y + d + (W+d2)/2-d1-2; + for (int n = 0; n < 3; n++, ty++) { + fl_line(tx, ty, tx+d1, ty+d1); + fl_line(tx+d1, ty+d1, tx+tw-1, ty+d1-d2+1); + } } } x += W + 3; diff -ur -- fltk-1.1.6/src/Fl_Menu_add.cxx fltk-utf8-1.1.6/src/Fl_Menu_add.cxx --- fltk-1.1.6/src/Fl_Menu_add.cxx 2004-04-11 05:38:58.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Menu_add.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -177,13 +177,18 @@ // make this widget own the local array: if (this != fl_menu_array_owner) { if (fl_menu_array_owner) { - Fl_Menu_* o = fl_menu_array_owner; - // the previous owner get's its own correctly-sized array: - int value_offset = o->value_-local_array; - int n = local_array_size; - Fl_Menu_Item* newMenu = o->menu_ = new Fl_Menu_Item[n]; - memcpy(newMenu, local_array, n*sizeof(Fl_Menu_Item)); - if (o->value_) o->value_ = newMenu+value_offset; +/* +* Fl_Menu_* o = fl_menu_array_owner; +* // the previous owner get's its own correctly-sized array: +* int value_offset = o->value_-local_array; +* int n = local_array_size; +* Fl_Menu_Item* newMenu = o->menu_ = new Fl_Menu_Item[n]; +* memcpy(newMenu, local_array, n*sizeof(Fl_Menu_Item)); +* if (o->value_) o->value_ = newMenu+value_offset; +*/ + local_array_size = 0; + local_array_alloc = 0; + local_array = NULL; } if (menu_) { // this already has a menu array, use it as the local one: diff -ur -- fltk-1.1.6/src/Fl_PNG_Image.cxx fltk-utf8-1.1.6/src/Fl_PNG_Image.cxx --- fltk-1.1.6/src/Fl_PNG_Image.cxx 2004-10-18 21:22:24.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_PNG_Image.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -37,6 +37,7 @@ #include #include #include +#include extern "C" { @@ -67,7 +68,7 @@ // Open the PNG file... - if ((fp = fopen(png, "rb")) == NULL) return; + if ((fp = fl_fopen(png, "rb")) == NULL) return; // Setup the PNG data structures... pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); diff -ur -- fltk-1.1.6/src/Fl_PNM_Image.cxx fltk-utf8-1.1.6/src/Fl_PNM_Image.cxx --- fltk-1.1.6/src/Fl_PNM_Image.cxx 2004-04-11 05:38:58.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_PNM_Image.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -35,8 +35,10 @@ #include #include #include +#include #include "flstring.h" +const char* Fl::txt_pnm_early_eof = "Early end-of-file in PNM file \"%s\"!"; // // 'Fl_PNM_Image::Fl_PNM_Image()' - Load a PNM image... @@ -56,7 +58,7 @@ maxval; // Maximum pixel value - if ((fp = fopen(name, "rb")) == NULL) return; + if ((fp = fl_fopen(name, "rb")) == NULL) return; // // Read the file header in the format: @@ -74,7 +76,7 @@ lineptr = fgets(line, sizeof(line), fp); if (!lineptr) { fclose(fp); - Fl::error("Early end-of-file in PNM file \"%s\"!", name); + Fl::error(Fl::txt_pnm_early_eof, name); return; } diff -ur -- fltk-1.1.6/src/Fl_Pixmap.cxx fltk-utf8-1.1.6/src/Fl_Pixmap.cxx --- fltk-1.1.6/src/Fl_Pixmap.cxx 2004-09-24 17:00:10.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Pixmap.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -58,6 +58,13 @@ } } +void Fl_Pixmap::to_rgba(uchar *buf) { + if (!data()) return; + if (w()<0) measure(); + if (!w()) return; + fl_rgba_pixmap(data(), FL_WHITE, buf); +} + void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) { // ignore empty or bad pixmap data: if (!data()) { diff -ur -- fltk-1.1.6/src/Fl_Preferences.cxx fltk-utf8-1.1.6/src/Fl_Preferences.cxx --- fltk-1.1.6/src/Fl_Preferences.cxx 2004-04-11 05:38:58.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Preferences.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -31,6 +31,7 @@ #include #include #include +#include #include "flstring.h" #include @@ -554,46 +555,14 @@ int Fl_Preferences::Node::lastEntrySet = -1; -// recursively create a path in the file system -static char makePath( const char *path ) { - if (access(path, 0)) { - const char *s = strrchr( path, '/' ); - if ( !s ) return 0; - int len = s-path; - char *p = (char*)malloc( len+1 ); - memcpy( p, path, len ); - p[len] = 0; - makePath( p ); - free( p ); -#if defined(WIN32) && !defined(__CYGWIN__) - return ( mkdir( path ) == 0 ); -#else - return ( mkdir( path, 0777 ) == 0 ); -#endif // WIN32 && !__CYGWIN__ - } - return 1; -} - -// strip the filename and create a path -static void makePathForFile( const char *path ) -{ - const char *s = strrchr( path, '/' ); - if ( !s ) return; - int len = s-path; - char *p = (char*)malloc( len+1 ); - memcpy( p, path, len ); - p[len] = 0; - makePath( p ); - free( p ); -} - // create the root node // - construct the name of the file that will hold our preferences Fl_Preferences::RootNode::RootNode( Fl_Preferences *prefs, Root root, const char *vendor, const char *application ) { - char filename[ FL_PATH_MAX ]; filename[0] = 0; + char filename[ FL_PATH_MAX * 5]; filename[0] = 0; #ifdef WIN32 # define FLPREFS_RESOURCE "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders" +# define FLPREFS_RESOURCEW L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders" int appDataLen = strlen(vendor) + strlen(application) + 8; DWORD type, nn; LONG err; @@ -601,29 +570,62 @@ switch (root) { case SYSTEM: - err = RegOpenKey( HKEY_LOCAL_MACHINE, FLPREFS_RESOURCE, &key ); + if (fl_is_nt4()) { + err = RegOpenKeyW( HKEY_LOCAL_MACHINE, FLPREFS_RESOURCEW, &key ); + } else { + err = RegOpenKeyA( HKEY_LOCAL_MACHINE, FLPREFS_RESOURCE, &key ); + } if (err == ERROR_SUCCESS) { - nn = FL_PATH_MAX - appDataLen; - err = RegQueryValueEx( key, "Common AppData", 0L, &type, (BYTE*)filename, &nn ); - if ( ( err != ERROR_SUCCESS ) && ( type == REG_SZ ) ) - filename[0] = 0; + nn = FL_PATH_MAX - appDataLen; + if (fl_is_nt4()) { + err = RegQueryValueExW( key, L"Common AppData", 0L, &type, + (BYTE*)filename, &nn ); + } else { + err = RegQueryValueExA( key, "Common AppData", 0L, &type, + (BYTE*)filename, &nn ); + } + if ( ( err != ERROR_SUCCESS ) && ( type == REG_SZ ) ) { + filename[0] = 0; + if (fl_is_nt4()) filename[1] = 0; + } RegCloseKey(key); } break; case USER: - err = RegOpenKey( HKEY_CURRENT_USER, FLPREFS_RESOURCE, &key ); + if (fl_is_nt4()) { + err = RegOpenKeyW( HKEY_CURRENT_USER, FLPREFS_RESOURCEW, &key ); + } else { + err = RegOpenKeyA( HKEY_CURRENT_USER, FLPREFS_RESOURCE, &key ); + } + if (err == ERROR_SUCCESS) { - nn = FL_PATH_MAX - appDataLen; - err = RegQueryValueEx( key, "AppData", 0L, &type, (BYTE*)filename, &nn ); - if ( ( err != ERROR_SUCCESS ) && ( type == REG_SZ ) ) - filename[0] = 0; + nn = FL_PATH_MAX - appDataLen; + if (fl_is_nt4()) { + err = RegQueryValueExW( key, L"AppData", 0L, &type, + (BYTE*)filename, &nn ); + } else { + err = RegQueryValueExA( key, "AppData", 0L, &type, + (BYTE*)filename, &nn ); + } + if ( ( err != ERROR_SUCCESS ) && ( type == REG_SZ ) ) { + filename[0] = 0; + if (fl_is_nt4()) filename[1] = 0; + } RegCloseKey(key); } break; } - if (!filename[0]) { - strcpy(filename, "C:\\FLTK"); + if (fl_is_nt4()) { + if (!filename[1] && !filename[0]) { + strcpy(filename, "C:\\xd640"); + } else { + xchar*b = (xchar*)_wcsdup((xchar*)filename); + filename[fl_unicode2utf(b, wcslen((xchar*)b), filename)] = 0; + free(b); + } + } else if (!filename[0]) { + strcpy(filename, "C:\\xd640"); } snprintf(filename + strlen(filename), sizeof(filename) - strlen(filename), @@ -651,19 +653,19 @@ const char *e; switch (root) { case USER: - if ((e = getenv("HOME")) != NULL) { + if ((e = fl_getenv("HOME")) != NULL) { strlcpy(filename, e, sizeof(filename)); if (filename[strlen(filename)-1] != '/') { - strlcat(filename, "/.fltk/", sizeof(filename)); + strlcat(filename, "/.xd640/", sizeof(filename)); } else { - strlcat(filename, ".fltk/", sizeof(filename)); + strlcat(filename, ".xd640/", sizeof(filename)); } break; } case SYSTEM: - strcpy(filename, "/etc/fltk/"); + strcpy(filename, "/etc/xd640/"); break; } @@ -713,7 +715,7 @@ int Fl_Preferences::RootNode::read() { char buf[1024]; - FILE *f = fopen( filename_, "rb" ); + FILE *f = fl_fopen( filename_, "rb" ); if ( !f ) return 0; fgets( buf, 1024, f ); fgets( buf, 1024, f ); @@ -754,8 +756,8 @@ // write the group tree and all entry leafs int Fl_Preferences::RootNode::write() { - makePathForFile(filename_); - FILE *f = fopen( filename_, "wb" ); + fl_make_path_for_file(filename_); + FILE *f = fl_fopen( filename_, "wb" ); if ( !f ) return 1; fprintf( f, "; FLTK preferences file format 1.0\n" ); fprintf( f, "; vendor: %s\n", vendor_ ); @@ -775,7 +777,7 @@ s = strrchr( path, '.' ); if ( !s ) return 0; *s = 0; - char ret = makePath( path ); + char ret = fl_make_path( path ); strcpy( s, "/" ); return ret; } Only in fltk-utf8-1.1.6/src: Fl_Shaped_Window.cxx diff -ur -- fltk-1.1.6/src/Fl_Shared_Image.cxx fltk-utf8-1.1.6/src/Fl_Shared_Image.cxx --- fltk-1.1.6/src/Fl_Shared_Image.cxx 2004-09-24 17:00:11.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Shared_Image.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -25,6 +25,7 @@ #include #include +#include #include "flstring.h" #include @@ -221,7 +222,7 @@ if (!name_) return; - if ((fp = fopen(name_, "rb")) != NULL) { + if ((fp = fl_fopen(name_, "rb")) != NULL) { fread(header, 1, sizeof(header), fp); fclose(fp); } else { Only in fltk-utf8-1.1.6/src: Fl_Table.cxx diff -ur -- fltk-1.1.6/src/Fl_Tabs.cxx fltk-utf8-1.1.6/src/Fl_Tabs.cxx --- fltk-1.1.6/src/Fl_Tabs.cxx 2004-07-27 17:02:21.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Tabs.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -89,6 +89,7 @@ int H = h(); int H2 = y(); Fl_Widget*const* a = array(); + if (tab_height_ > -1) return tab_height_; for (int i=children(); i--;) { Fl_Widget* o = *a++; if (o->y() < y()+H) H = o->y()-y(); @@ -99,6 +100,10 @@ else return (H <= 0) ? 0 : H; } +void Fl_Tabs::tab_height(int h) { + tab_height_ = h; +} + // this is used by fluid to pick tabs: Fl_Widget *Fl_Tabs::which(int event_x, int event_y) { int H = tab_height(); @@ -306,6 +311,7 @@ { box(FL_THIN_UP_BOX); push_ = 0; + tab_height_ = -1; } // diff -ur -- fltk-1.1.6/src/Fl_Text_Buffer.cxx fltk-utf8-1.1.6/src/Fl_Text_Buffer.cxx --- fltk-1.1.6/src/Fl_Text_Buffer.cxx 2004-09-08 16:42:47.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Text_Buffer.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -25,6 +25,7 @@ #include #include +#include #include "flstring.h" #include #include @@ -78,6 +79,27 @@ static int undoinsert; // number of characters inserted static int undoyankcut; // length of valid contents of buffer, even if undocut=0 +static int utf_len(char c) +{ + if (!(c & 0x80)) return 1; + if (c & 0x40) { + if (c & 0x20) { + if (c & 0x10) { + if (c & 0x08) { + if (c & 0x04) { + return 6; + } + return 5; + } + return 4; + } + return 3; + } + return 2; + } + return 0; +} + static void undobuffersize(int n) { if (n > undobufferlength) { if (undobuffer) { @@ -195,7 +217,7 @@ ** include the character pointed to by "end" */ char * Fl_Text_Buffer::text_range( int start, int end ) { - char * s; + char * s = NULL; int copiedLength, part1Length; /* Make sure start and end are ok, and allocate memory for returned string. @@ -386,6 +408,9 @@ mCanUndo = flag; } +const char *Fl::txt_ins1_failed = "Fl_Text_Buffer::insert_column(): internal consistency check ins1 failed"; +const char *Fl::txt_ovly1_failed = "Fl_Text_Buffer::overlay_rectangle(): internal consistency check ovly1 failed"; + /* ** Insert "text" columnwise into buffer starting at displayed character ** position "column" on the line beginning at "startPos". Opens a rectangular @@ -408,7 +433,7 @@ insert_column_( column, lineStartPos, s, &insertDeleted, &nInserted, &mCursorPosHint ); if ( nDeleted != insertDeleted ) - Fl::error("Fl_Text_Buffer::insert_column(): internal consistency check ins1 failed"); + Fl::error(Fl::txt_ins1_failed); call_modify_callbacks( lineStartPos, nDeleted, nInserted, 0, deletedText ); free( (void *) deletedText ); if ( charsInserted != NULL ) @@ -437,7 +462,7 @@ overlay_rectangular_( lineStartPos, rectStart, rectEnd, s, &insertDeleted, &nInserted, &mCursorPosHint ); if ( nDeleted != insertDeleted ) - Fl::error("Fl_Text_Buffer::overlay_rectangle(): internal consistency check ovly1 failed"); + Fl::error(Fl::txt_ovly1_failed); call_modify_callbacks( lineStartPos, nDeleted, nInserted, 0, deletedText ); free( (void *) deletedText ); if ( charsInserted != NULL ) @@ -446,6 +471,8 @@ * charsDeleted = nDeleted; } +const char *Fl::txt_repl1_failed = "Fl_Text_Buffer::replace_rectangular(): internal consistency check repl1 failed"; + /* ** Replace a rectangular area in buf, given by "start", "end", "rectStart", ** and "rectEnd", with "text". If "text" is vertically longer than the @@ -499,13 +526,15 @@ /* Figure out how many chars were inserted and call modify callbacks */ if ( insertDeleted != deleteInserted + linesPadded ) - Fl::error("Fl_Text_Buffer::replace_rectangular(): internal consistency check repl1 failed"); + Fl::error(Fl::txt_repl1_failed); call_modify_callbacks( start, end - start, insertInserted, 0, deletedText ); free( (void *) deletedText ); if ( nInsertedLines < nDeletedLines ) free( (void *) insText ); } +const char *Fl::txt_cannot_modify_cb = "Fl_Text_Buffer::remove_modify_callback(): Can't find modify CB to remove"; + /* ** Remove a rectangular swath of characters between character positions start ** and end and horizontal displayed-character offsets rectStart and rectEnd. @@ -743,6 +772,8 @@ mCbArgs = newCBArgs; } +const char *Fl::txt_cannot_find_pre = "Fl_Text_Buffer::remove_predelete_callback(): Can't find pre-delete CB to remove"; + void Fl_Text_Buffer::remove_modify_callback( Fl_Text_Modify_Cb bufModifiedCB, void *cbArg ) { int i, toRemove = -1; @@ -757,7 +788,7 @@ } } if ( toRemove == -1 ) { - Fl::error("Fl_Text_Buffer::remove_modify_callback(): Can't find modify CB to remove"); + Fl::error(Fl::txt_cannot_modify_cb); return; } @@ -915,8 +946,22 @@ ** equal in length to FL_TEXT_MAX_EXP_CHAR_LEN */ int Fl_Text_Buffer::expand_character( int pos, int indent, char *outStr ) { - return expand_character( character( pos ), indent, outStr, - mTabDist, mNullSubsChar ); + int ret; + char c = character( pos ); + ret = expand_character( c, indent, outStr, + mTabDist, mNullSubsChar ); + if (ret > 1 && (c & 0x80)) { + int i; + i = utf_len(c); + while (i > 1) { + i--; + pos++; + outStr++; + *outStr = character( pos ); + } + } + + return ret; } /* @@ -950,6 +995,11 @@ } else if ( c == nullSubsChar ) { sprintf( outStr, "" ); return 5; + } else if ((c & 0x80) && !(c & 0x40)) { + return 0; + } else if (c & 0x80) { + *outStr = c; + return utf_len(c); } /* Otherwise, just return the character */ @@ -974,6 +1024,11 @@ return 5; else if ( c == nullSubsChar ) return 5; + else if ((c & 0x80) && !(c & 0x40)) + return 0; + else if (c & 0x80) { + return utf_len(c); + } return 1; } @@ -2486,7 +2541,7 @@ int Fl_Text_Buffer::insertfile(const char *file, int pos, int buflen) { FILE *fp; int r; - if (!(fp = fopen(file, "r"))) return 1; + if (!(fp = fl_fopen(file, "r"))) return 1; char *buffer = new char[buflen]; for (; (r = fread(buffer, 1, buflen - 1, fp)) > 0; pos += r) { buffer[r] = (char)0; @@ -2502,7 +2557,7 @@ int Fl_Text_Buffer::outputfile(const char *file, int start, int end, int buflen) { FILE *fp; - if (!(fp = fopen(file, "w"))) return 1; + if (!(fp = fl_fopen(file, "w"))) return 1; for (int n; (n = min(end - start, buflen)); start += n) { const char *p = text_range(start, start + n); int r = fwrite(p, 1, n, fp); diff -ur -- fltk-1.1.6/src/Fl_Text_Display.cxx fltk-utf8-1.1.6/src/Fl_Text_Display.cxx --- fltk-1.1.6/src/Fl_Text_Display.cxx 2004-11-20 03:44:17.000000000 +0000 +++ fltk-utf8-1.1.6/src/Fl_Text_Display.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -25,6 +25,7 @@ #include #include +#include #include "flstring.h" #include #include @@ -67,6 +68,30 @@ // CET - FIXME #define TMPFONTWIDTH 6 +const char* Fl::txt_ptvl_failed = "Fl_Text_Display::position_to_line(): Consistency check ptvl failed"; +const char* Fl::txt_bad_measurement = "Fl_Text_Display::draw_vline(): bad font measurement"; + +static int utf_len(char c) +{ + if (!(c & 0x80)) return 1; + if (c & 0x40) { + if (c & 0x20) { + if (c & 0x10) { + if (c & 0x08) { + if (c & 0x04) { + return 6; + } + return 5; + } + return 4; + } + return 3; + } + return 2; + } + return 0; +} + Fl_Text_Display::Fl_Text_Display(int X, int Y, int W, int H, const char* l) : Fl_Group(X, Y, W, H, l) { int i; @@ -531,6 +556,23 @@ } void Fl_Text_Display::redisplay_range(int startpos, int endpos) { + int ok = 0; + while (!ok && startpos > 0) { + char c = buffer()->character( startpos ); + if (!((c & 0x80) && !(c & 0x40))) { + ok = 1; + } else { + startpos--; + } + } + while (!ok && endpos < buffer()->length()) { + char c = buffer()->character( endpos ); + if (!((c & 0x80) && !(c & 0x40))) { + ok = 1; + } else { + endpos++; + } + } if (damage_range1_start == -1 && damage_range1_end == -1) { damage_range1_start = startpos; damage_range1_end = endpos; @@ -623,17 +665,17 @@ mCursorPreferredCol = -1; /* erase the cursor at it's previous position */ - redisplay_range(mCursorPos - 1, mCursorPos + 1); + redisplay_range(mCursorPos - 5, mCursorPos + 5); mCursorPos = newPos; /* draw cursor at its new position */ - redisplay_range(mCursorPos - 1, mCursorPos + 1); + redisplay_range(mCursorPos - 5, mCursorPos + 5); } void Fl_Text_Display::show_cursor(int b) { mCursorOn = b; - redisplay_range(mCursorPos - 1, mCursorPos + 1); + redisplay_range(mCursorPos - 5, mCursorPos + 5); } void Fl_Text_Display::cursor_style(int style) { @@ -789,6 +831,15 @@ for ( charIndex = 0; charIndex < lineLen && charIndex < pos - lineStartPos; charIndex++ ) { charLen = Fl_Text_Buffer::expand_character( lineStr[ charIndex ], outIndex, expandedChar, mBuffer->tab_distance(), mBuffer->null_substitution_character() ); + if (charLen > 1 && (lineStr[ charIndex ] & 0x80)) { + int i, ii = 0;; + i = utf_len(lineStr[ charIndex ]); + while (i > 1) { + i--; + ii++; + expandedChar[ii] = lineStr[ charIndex + ii]; + } + } charStyle = position_style( lineStartPos, lineLen, charIndex, outIndex ); xStep += string_width( expandedChar, charLen, charStyle ); @@ -838,6 +889,15 @@ int Fl_Text_Display::in_selection( int X, int Y ) { int row, column, pos = xy_to_position( X, Y, CHARACTER_POS ); Fl_Text_Buffer *buf = mBuffer; + int ok = 0; + while (!ok) { + char c = buffer()->character( pos ); + if (!((c & 0x80) && !(c & 0x40))) { + ok = 1; + } else { + pos++; + } + } xy_to_rowcol( X, Y, &row, &column, CHARACTER_POS ); if (range_touches_selection(buf->primary_selection(), mFirstChar, mLastChar)) @@ -934,16 +994,28 @@ ** Cursor movement functions */ int Fl_Text_Display::move_right() { - if ( mCursorPos >= mBuffer->length() ) - return 0; - insert_position( mCursorPos + 1 ); + int ok = 0; + while (!ok) { + if ( mCursorPos >= mBuffer->length() ) + return 0; + insert_position( mCursorPos + 1 ); + int pos = insert_position(); + char c = buffer()->character( pos ); + if (!((c & 0x80) && !(c & 0x40))) ok = 1; + } return 1; } int Fl_Text_Display::move_left() { - if ( mCursorPos <= 0 ) - return 0; - insert_position( mCursorPos - 1 ); + int ok = 0; + while (!ok) { + if ( mCursorPos <= 0 ) + return 0; + insert_position( mCursorPos - 1 ); + int pos = insert_position(); + char c = buffer()->character( pos ); + if (!((c & 0x80) && !(c & 0x40))) ok = 1; + } return 1; } @@ -977,6 +1049,17 @@ /* move the cursor */ insert_position( newPos ); + int ok = 0; + while (!ok) { + int pos = insert_position(); + char c = buffer()->character( pos ); + if (!((c & 0x80) && !(c & 0x40))) { + ok = 1; + } else { + insert_position( mCursorPos + 1 ); + } + } + /* if a preferred column wasn't aleady established, establish it */ mCursorPreferredCol = column; return 1; @@ -1001,6 +1084,16 @@ newPos = min(newPos, line_end(nextLineStartPos, true)); insert_position( newPos ); + int ok = 0; + while (!ok) { + int pos = insert_position(); + char c = buffer()->character( pos ); + if (!((c & 0x80) && !(c & 0x40))) { + ok = 1; + } else { + insert_position( mCursorPos + 1 ); + } + } mCursorPreferredCol = column; return 1; } @@ -1304,7 +1397,7 @@ textD->extend_range_for_styles( &startDispPos, &endDispPos ); /* Redisplay computed range */ - textD->redisplay_range( startDispPos, endDispPos ); + textD->redisplay_range( startDispPos - 5, endDispPos + 5 ); } /* @@ -1378,7 +1471,7 @@ if ( empty_vlines() ) { if ( mLastChar < mBuffer->length() ) { if ( !position_to_line( mLastChar, lineNum ) ) { - Fl::error("Fl_Text_Display::position_to_line(): Consistency check ptvl failed"); + Fl::error(Fl::txt_ptvl_failed); return 0; } return ++( *lineNum ) <= mNVisibleLines - 1; @@ -1447,7 +1540,7 @@ prevent a potential infinite loop if X does not advance */ stdCharWidth = TMPFONTWIDTH; //mFontStruct->max_bounds.width; if ( stdCharWidth <= 0 ) { - Fl::error("Fl_Text_Display::draw_vline(): bad font measurement"); + Fl::error(Fl::txt_bad_measurement); free((void *)lineStr); return; } @@ -1481,6 +1574,16 @@ charLen = charIndex >= lineLen ? 1 : Fl_Text_Buffer::expand_character( lineStr[ charIndex ], outIndex, expandedChar, buf->tab_distance(), buf->null_substitution_character() ); + if (charIndex < lineLen && charLen > 1 && (lineStr[ charIndex ] & 0x80)) { + int i, ii = 0;; + i = utf_len(lineStr[ charIndex ]); + while (i > 1) { + i--; + ii++; + expandedChar[ii] = lineStr[ charIndex + ii]; + } + } + style = position_style( lineStartPos, lineLen, charIndex, outIndex + dispIndexOffset ); charWidth = charIndex >= lineLen ? stdCharWidth : @@ -1509,6 +1612,15 @@ charLen = charIndex >= lineLen ? 1 : Fl_Text_Buffer::expand_character( lineStr[ charIndex ], outIndex, expandedChar, buf->tab_distance(), buf->null_substitution_character() ); + if (charIndex < lineLen && charLen > 1 && (lineStr[ charIndex ] & 0x80)) { + int i, ii = 0;; + i = utf_len(lineStr[ charIndex ]); + while (i > 1) { + i--; + ii++; + expandedChar[ii] = lineStr[ charIndex + ii]; + } + } charStyle = position_style( lineStartPos, lineLen, charIndex, outIndex + dispIndexOffset ); for ( i = 0; i < charLen; i++ ) { @@ -1523,7 +1635,11 @@ } if ( charIndex < lineLen ) { *outPtr = expandedChar[ i ]; - charWidth = string_width( &expandedChar[ i ], 1, charStyle ); + int l = 1; + if (*outPtr & 0x80) { + l = utf_len(*outPtr); + } + charWidth = string_width( &expandedChar[ i ], l, charStyle ); } else charWidth = stdCharWidth; outPtr++; @@ -1543,6 +1659,15 @@ charLen = charIndex >= lineLen ? 1 : Fl_Text_Buffer::expand_character( lineStr[ charIndex ], outIndex, expandedChar, buf->tab_distance(), buf->null_substitution_character() ); + if (charIndex < lineLen && charLen > 1 && (lineStr[ charIndex ] & 0x80)) { + int i, ii = 0;; + i = utf_len(lineStr[ charIndex ]); + while (i > 1) { + i--; + ii++; + expandedChar[ii] = lineStr[ charIndex + ii]; + } + } charStyle = position_style( lineStartPos, lineLen, charIndex, outIndex + dispIndexOffset ); for ( i = 0; i < charLen; i++ ) { @@ -1557,7 +1682,11 @@ } if ( charIndex < lineLen ) { *outPtr = expandedChar[ i ]; - charWidth = string_width( &expandedChar[ i ], 1, charStyle ); + int l = 1; + if (*outPtr & 0x80) { + l = utf_len(*outPtr); + } + charWidth = string_width( &expandedChar[ i ], l, charStyle ); } else charWidth = stdCharWidth; outPtr++; @@ -1775,6 +1904,7 @@ for ( int k = 0; k < nSegs; k++ ) { fl_line( segs[ k ].x1, segs[ k ].y1, segs[ k ].x2, segs[ k ].y2 ); } + fl_set_spot(fl_font(), fl_size(), X, Y + fl_size() - fl_descent(), w(), h()); } /* @@ -1885,6 +2015,15 @@ for ( charIndex = 0; charIndex < lineLen; charIndex++ ) { charLen = Fl_Text_Buffer::expand_character( lineStr[ charIndex ], outIndex, expandedChar, mBuffer->tab_distance(), mBuffer->null_substitution_character() ); + if (charLen > 1 && (lineStr[ charIndex ] & 0x80)) { + int i, ii = 0;; + i = utf_len(lineStr[ charIndex ]); + while (i > 1) { + i--; + ii++; + expandedChar[ii] = lineStr[ charIndex + ii]; + } + } charStyle = position_style( lineStart, lineLen, charIndex, outIndex ); charWidth = string_width( expandedChar, charLen, charStyle ); if ( X < xStep + ( posType == CURSOR_POS ? charWidth / 2 : charWidth ) ) { @@ -3067,6 +3206,15 @@ if (Fl::event_state()&FL_SHIFT) return handle(FL_DRAG); dragging = 1; int pos = xy_to_position(Fl::event_x(), Fl::event_y(), CURSOR_POS); + int ok = 0; + while (!ok) { + char c = buffer()->character( pos ); + if (!((c & 0x80) && !(c & 0x40))) { + ok = 1; + } else { + pos++; + } + } dragType = Fl::event_clicks(); dragPos = pos; if (dragType == DRAG_CHAR) @@ -3095,7 +3243,18 @@ move_down(); scroll(mTopLineNum + 1, mHorizOffset); pos = insert_position(); - } else pos = xy_to_position(X, Y, CURSOR_POS); + } else { + pos = xy_to_position(X, Y, CURSOR_POS); + int ok = 0; + while (!ok) { + char c = buffer()->character( pos ); + if (!((c & 0x80) && !(c & 0x40))) { + ok = 1; + } else { + pos++; + } + } + } fl_text_drag_me(pos, this); return 1; } diff -ur -- fltk-1.1.6/src/Fl_Text_Editor.cxx fltk-utf8-1.1.6/src/Fl_Text_Editor.cxx --- fltk-1.1.6/src/Fl_Text_Editor.cxx 2004-07-27 17:02:21.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Text_Editor.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -31,6 +31,26 @@ #include #include +static int utf_len(char c) +{ + if (!(c & 0x80)) return 1; + if (c & 0x40) { + if (c & 0x20) { + if (c & 0x10) { + if (c & 0x08) { + if (c & 0x04) { + return 6; + } + return 5; + } + return 4; + } + return 3; + } + return 2; + } + return 0; +} Fl_Text_Editor::Fl_Text_Editor(int X, int Y, int W, int H, const char* l) : Fl_Text_Display(X, Y, W, H, l) { @@ -195,8 +215,14 @@ } int Fl_Text_Editor::kf_backspace(int, Fl_Text_Editor* e) { - if (!e->buffer()->selected() && e->move_left()) - e->buffer()->select(e->insert_position(), e->insert_position()+1); + if (!e->buffer()->selected() && e->move_left()) { + int l = 1; + char c = e->buffer()->character(e->insert_position()); + if (c & 0x80 && c & 0x40) { + l = utf_len(c); + } + e->buffer()->select(e->insert_position(), e->insert_position()+l); + } kill_selection(e); e->show_insert_position(); e->set_changed(); @@ -340,8 +366,15 @@ } int Fl_Text_Editor::kf_delete(int, Fl_Text_Editor* e) { - if (!e->buffer()->selected()) - e->buffer()->select(e->insert_position(), e->insert_position()+1); + if (!e->buffer()->selected()) { + int l = 1; + char c = e->buffer()->character(e->insert_position()); + if (c & 0x80 && c & 0x40) { + l = utf_len(c); + } + e->buffer()->select(e->insert_position(), e->insert_position()+l); + } + kill_selection(e); e->show_insert_position(); e->set_changed(); @@ -396,7 +429,7 @@ // This uses the right-hand ctrl key as a "compose prefix" and returns // the changes that should be made to the text, as a number of // bytes to delete and a string to insert: - int del; + int del = 0; if (Fl::compose(del)) { if (del) buffer()->select(insert_position()-del, insert_position()); kill_selection(this); @@ -440,6 +473,7 @@ switch (event) { case FL_FOCUS: + fl_set_spot(textfont(), textsize(), x(), y(), w(), h()); show_cursor(mCursorOn); // redraws the cursor if (buffer()->selected()) redraw(); // Redraw selections... Fl::focus(this); @@ -449,6 +483,7 @@ show_cursor(mCursorOn); // redraws the cursor if (buffer()->selected()) redraw(); // Redraw selections... case FL_HIDE: + fl_reset_spot(); if (when() & FL_WHEN_RELEASE) maybe_do_callback(); return 1; diff -ur -- fltk-1.1.6/src/Fl_Tile.cxx fltk-utf8-1.1.6/src/Fl_Tile.cxx --- fltk-1.1.6/src/Fl_Tile.cxx 2004-07-27 17:02:21.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_Tile.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -37,7 +37,7 @@ void Fl_Tile::position(int oix, int oiy, int newx, int newy) { Fl_Widget*const* a = array(); - short* p = sizes(); + int* p = sizes(); p += 8; // skip group & resizable's saved size for (int i=children(); i--; p += 4) { Fl_Widget* o = *a++; @@ -69,7 +69,7 @@ int dy = Y-y(); int dw = W-w(); int dh = H-h(); - short* p = sizes(); + int* p = sizes(); // resize this (skip the Fl_Group resize): Fl_Widget::resize(X,Y,W,H); // find bottom-right of resiable: @@ -132,8 +132,8 @@ int oldx = 0; int oldy = 0; Fl_Widget*const* a = array(); - short* q = sizes(); - short* p = q+8; + int* q = sizes(); + int* p = q+8; for (int i=children(); i--; p += 4) { Fl_Widget* o = *a++; if (o == resizable()) continue; Only in fltk-utf8-1.1.6/src: Fl_Tree.cxx diff -ur -- fltk-1.1.6/src/Fl_XBM_Image.cxx fltk-utf8-1.1.6/src/Fl_XBM_Image.cxx --- fltk-1.1.6/src/Fl_XBM_Image.cxx 2004-04-11 05:38:58.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_XBM_Image.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -35,6 +35,7 @@ #include #include #include +#include #include "flstring.h" // @@ -45,7 +46,7 @@ FILE *f; uchar *ptr; - if ((f = fopen(name, "rb")) == NULL) return; + if ((f = fl_fopen(name, "rb")) == NULL) return; char buffer[1024]; char junk[1024]; diff -ur -- fltk-1.1.6/src/Fl_XPM_Image.cxx fltk-utf8-1.1.6/src/Fl_XPM_Image.cxx --- fltk-1.1.6/src/Fl_XPM_Image.cxx 2004-04-11 05:38:58.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_XPM_Image.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -34,6 +34,7 @@ #include #include #include +#include #include "flstring.h" @@ -54,7 +55,7 @@ Fl_XPM_Image::Fl_XPM_Image(const char *name) : Fl_Pixmap((char *const*)0) { FILE *f; - if ((f = fopen(name, "rb")) == NULL) return; + if ((f = fl_fopen(name, "rb")) == NULL) return; // read all the c-strings out of the file: char** new_data = new char *[INITIALLINES]; diff -ur -- fltk-1.1.6/src/Fl_abort.cxx fltk-utf8-1.1.6/src/Fl_abort.cxx --- fltk-1.1.6/src/Fl_abort.cxx 2004-04-11 05:38:58.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_abort.cxx 2005-06-12 19:06:26.000000000 +0100 @@ -33,6 +33,8 @@ #include #include "flstring.h" +const char *Fl::txt_error = "Error"; + #ifdef WIN32 # include @@ -46,7 +48,7 @@ va_start(args, format); vsnprintf(buf, 1024, format, args); va_end(args); - MessageBox(0,buf,"Error",MB_ICONEXCLAMATION|MB_SYSTEMMODAL); + MessageBox(0,buf,Fl::txt_error,MB_ICONEXCLAMATION|MB_SYSTEMMODAL); } static void fatal(const char *format, ...) { @@ -55,7 +57,7 @@ va_start(args, format); vsnprintf(buf, 1024, format, args); va_end(args); - MessageBox(0,buf,"Error",MB_ICONSTOP|MB_SYSTEMMODAL); + MessageBox(0,buf,Fl::txt_error,MB_ICONSTOP|MB_SYSTEMMODAL); ::exit(1); } diff -ur -- fltk-1.1.6/src/Fl_compose.cxx fltk-utf8-1.1.6/src/Fl_compose.cxx --- fltk-1.1.6/src/Fl_compose.cxx 2004-04-11 05:38:59.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_compose.cxx 2005-06-12 19:06:26.000000000 +0100 @@ -88,7 +88,9 @@ if (compose_state == 1) { // after the compose key if (ascii == ' ') { // space turns into nbsp - e_text[0] = char(0xA0); + int len = fl_ucs2utf(0xA0, e_text); + e_text[len] = '\0'; + e_length = len; compose_state = 0; return 1; } else if (ascii < ' ' || ascii == 127) { @@ -99,7 +101,12 @@ // see if it is either character of any pair: for (const char *p = compose_pairs; *p; p += 2) if (p[0] == ascii || p[1] == ascii) { - if (p[1] == ' ') e_text[0] = (p-compose_pairs)/2+0xA0; + if (p[1] == ' ') { + int len = fl_ucs2utf((p-compose_pairs)/2+0xA0, e_text); + e_text[len] = '\0'; + e_length = len; + } + compose_state = ascii; return 1; } @@ -115,7 +122,9 @@ // now search for the pair in either order: for (const char *p = compose_pairs; *p; p += 2) { if (p[0] == ascii && p[1] == c1 || p[1] == ascii && p[0] == c1) { - e_text[0] = (p-compose_pairs)/2+0xA0; + int len = fl_ucs2utf((p-compose_pairs)/2+0xA0, e_text); + e_text[len] = '\0'; + e_length = len; del = 1; // delete the old character and insert new one compose_state = 0; return 1; diff -ur -- fltk-1.1.6/src/Fl_get_system_colors.cxx fltk-utf8-1.1.6/src/Fl_get_system_colors.cxx --- fltk-1.1.6/src/Fl_get_system_colors.cxx 2004-05-25 22:06:19.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_get_system_colors.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -27,6 +27,7 @@ #include #include #include +#include #include "flstring.h" #include #include @@ -38,6 +39,7 @@ extern "C" int putenv(const char*); #endif // __APPLE__ && __MWERKS__ +const char* Fl::txt_unknown_color = "Unknown color: %s"; static char fl_bg_set = 0; static char fl_bg2_set = 0; @@ -132,7 +134,7 @@ if (arg) { uchar r,g,b; if (!fl_parse_color(arg, r,g,b)) - Fl::error("Unknown color: %s", arg); + Fl::error(Fl::txt_unknown_color, arg); else func(r,g,b); } else { @@ -183,7 +185,7 @@ } XColor x; if (!XParseColor(fl_display, fl_colormap, arg, &x)) - Fl::error("Unknown color: %s", arg); + Fl::error(Fl::txt_unknown_color, arg); else func(x.red>>8, x.green>>8, x.blue>>8); } diff -ur -- fltk-1.1.6/src/Fl_win32.cxx fltk-utf8-1.1.6/src/Fl_win32.cxx --- fltk-1.1.6/src/Fl_win32.cxx 2004-10-19 19:21:52.000000000 +0100 +++ fltk-utf8-1.1.6/src/Fl_win32.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: Fl_win32.cxx,v 1.33.2.37.2.51 2004/10/19 18:21:52 easysw Exp $" +// "$Id: Fl_win32.cxx,v 1.33.2.37.2.37 2002/07/01 20:14:08 easysw Exp $" // // WIN32-specific code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2002 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 @@ -29,8 +29,10 @@ #include #include +#include #include -#include +#include +#include #include "flstring.h" #include #include @@ -51,6 +53,7 @@ # include #endif // !__GNUC__ || __GNUC__ >= 3 +#include "aimm.h" // // USE_ASYNC_SELECT - define it if you have WSAAsyncSelect()... @@ -73,7 +76,7 @@ //#define USE_TRACK_MOUSE #if !defined(__GNUC__) -# define USE_TRACK_MOUSE +//# define USE_TRACK_MOUSE #endif // !__GNUC__ @@ -139,6 +142,35 @@ void* arg; } *fd = 0; +extern unsigned int fl_codepage; + +void fl_reset_spot() +{ +} + +void fl_set_spot(int font, int size, int x, int y, int w, int h) +{ + HIMC himc = ImmGetContext(fl_msg.hwnd); + if (himc) { + Fl_Window* w = fl_find(fl_msg.hwnd); + + while (w->parent()) w = w->window(); + + COMPOSITIONFORM cfs; + cfs.dwStyle = CFS_POINT; + cfs.ptCurrentPos.x = x; + cfs.ptCurrentPos.y = y - w->labelsize(); + MapWindowPoints(fl_msg.hwnd, fl_xid(w), &cfs.ptCurrentPos, 1); + ImmSetCompositionWindow(himc, &cfs); + + ImmReleaseContext(fl_msg.hwnd, himc); + } +} + +void fl_set_status(int x, int y, int w, int h) +{ +} + void Fl::add_fd(int n, int events, void (*cb)(int, void*), void *v) { remove_fd(n,events); int i = nfds++; @@ -158,9 +190,9 @@ if (events & POLLERR) mask |= FD_CLOSE; WSAAsyncSelect(n, fl_window, WM_FLSELECT, mask); #else - if (events & POLLIN) FD_SET(n, &fdsets[0]); - if (events & POLLOUT) FD_SET(n, &fdsets[1]); - if (events & POLLERR) FD_SET(n, &fdsets[2]); + if (events & POLLIN) FD_SET((unsigned)n, &fdsets[0]); + if (events & POLLOUT) FD_SET((unsigned)n, &fdsets[1]); + if (events & POLLERR) FD_SET((unsigned)n, &fdsets[2]); if (n > maxfd) maxfd = n; #endif // USE_ASYNC_SELECT } @@ -210,6 +242,7 @@ return r; } +IActiveIMMApp *fl_aimm = NULL; MSG fl_msg; // This is never called with time_to_wait < 0.0. @@ -259,7 +292,11 @@ if (time_to_wait < 2147483.648) { // Perform the requested timeout... - have_message = PeekMessage(&fl_msg, NULL, 0, 0, PM_REMOVE); + if (fl_is_nt4()) { + have_message = PeekMessageW(&fl_msg, NULL, 0, 0, PM_REMOVE); + } else { + have_message = PeekMessage(&fl_msg, NULL, 0, 0, PM_REMOVE); + } if (!have_message) { int t = (int)(time_to_wait * 1000.0 + .5); if (t <= 0) { // too short to measure @@ -267,11 +304,19 @@ return 0; } timerid = SetTimer(NULL, 0, t, NULL); - have_message = GetMessage(&fl_msg, NULL, 0, 0); + if (fl_is_nt4()) { + have_message = GetMessageW(&fl_msg, NULL, 0, 0); + } else { + have_message = GetMessage(&fl_msg, NULL, 0, 0); + } KillTimer(NULL, timerid); } } else { - have_message = GetMessage(&fl_msg, NULL, 0, 0); + if (fl_is_nt4()) { + have_message = GetMessageW(&fl_msg, NULL, 0, 0); + } else { + have_message = GetMessage(&fl_msg, NULL, 0, 0); + } } fl_lock_function(); @@ -294,8 +339,13 @@ thread_message_ = (void*)fl_msg.wParam; TranslateMessage(&fl_msg); - DispatchMessage(&fl_msg); - have_message = PeekMessage(&fl_msg, NULL, 0, 0, PM_REMOVE); + if (fl_is_nt4()) { + DispatchMessageW(&fl_msg); + have_message = PeekMessageW(&fl_msg, NULL, 0, 0, PM_REMOVE); + } else { + DispatchMessage(&fl_msg); + have_message = PeekMessage(&fl_msg, NULL, 0, 0, PM_REMOVE); + } } // This should return 0 if only timer events were handled: @@ -368,6 +418,14 @@ int fl_selection_buffer_length[2]; char fl_i_own_selection[2]; + +UINT fl_get_lcid_codepage(LCID id) +{ + char buf[8]; + buf[GetLocaleInfo(id, LOCALE_IDEFAULTANSICODEPAGE, buf, 8)] = 0; + return atol(buf); +} + // call this when you create a selection: void Fl::copy(const char *stuff, int len, int clipboard) { if (!stuff || len<0) return; @@ -383,13 +441,18 @@ // set up for "delayed rendering": if (OpenClipboard(fl_xid(Fl::first_window()))) { EmptyClipboard(); - SetClipboardData(CF_TEXT, NULL); + if (fl_is_nt4()) { + SetClipboardData(CF_UNICODETEXT, NULL); + } else { + SetClipboardData(CF_TEXT, NULL); + } CloseClipboard(); } fl_i_own_selection[clipboard] = 1; } } + // Call this when a "paste" operation happens: void Fl::paste(Fl_Widget &receiver, int clipboard) { if (!clipboard || fl_i_own_selection[clipboard]) { @@ -403,9 +466,29 @@ receiver.handle(FL_PASTE); } else { if (!OpenClipboard(NULL)) return; - HANDLE h = GetClipboardData(CF_TEXT); + HANDLE hh = GetClipboardData(CF_LOCALE); + UINT *i = (UINT*)GlobalLock(hh); + UINT id = *i; + GlobalUnlock(hh); + HANDLE h; + if (fl_is_nt4()) { + h = GetClipboardData(CF_UNICODETEXT); + } else { + h = GetClipboardData(CF_TEXT); + } if (h) { - Fl::e_text = (LPSTR)GlobalLock(h); + void *g = GlobalLock(h); + if (!g) { + CloseClipboard(); + return; + } + if (fl_is_nt4()) { + int l = wcslen((wchar_t*)g); + Fl::e_text = (char*) malloc(l * 5 + 1); + Fl::e_text[fl_unicode2utf((xchar*)g, l, Fl::e_text)] = 0; + } else { + Fl::e_text = fl_locale2utf8((char *)g, fl_get_lcid_codepage(id), 0); + } LPSTR a,b; a = b = Fl::e_text; while (*a) { // strip the CRLF pairs ($%$#@^) @@ -416,6 +499,9 @@ Fl::e_length = b - Fl::e_text; receiver.handle(FL_PASTE); GlobalUnlock(h); + if(fl_is_nt4()) { + free(Fl::e_text); + } } CloseClipboard(); } @@ -423,6 +509,25 @@ //////////////////////////////////////////////////////////////// +char fl_is_ime = 0; +void fl_get_codepage() +{ + HKL hkl = GetKeyboardLayout(0); + TCHAR ld[8]; + + GetLocaleInfo (LOWORD(hkl), + LOCALE_IDEFAULTANSICODEPAGE, ld, 6); + DWORD ccp = atol(ld); + fl_is_ime = 0; + + fl_codepage = ccp; + if (fl_aimm) { + fl_aimm->GetCodePageA(GetKeyboardLayout(0), &fl_codepage); + } else if (ImmIsIME(hkl)) { + fl_is_ime = 1; + } +} + HWND fl_capture; static int mouse_event(Fl_Window *window, int what, int button, @@ -430,8 +535,10 @@ { static int px, py, pmx, pmy; POINT pt; - Fl::e_x = pt.x = (signed short)LOWORD(lParam); - Fl::e_y = pt.y = (signed short)HIWORD(lParam); +// Fl::e_x = pt.x = (signed short)LOWORD(lParam); +// Fl::e_y = pt.y = (signed short)HIWORD(lParam)); + Fl::e_x = pt.x = (signed short)(lParam & 0xFFFF); + Fl::e_y = pt.y = (signed short)((lParam >> 16) & 0xFFFF); ClientToScreen(fl_xid(window), &pt); Fl::e_x_root = pt.x; Fl::e_y_root = pt.y; @@ -566,7 +673,9 @@ //fl_msg.time = ??? //fl_msg.pt = ??? //fl_msg.lPrivate = ??? - + + static unsigned short wbuf[200]; + static long wlen = 0; Fl_Window *window = fl_find(hWnd); if (window) switch (uMsg) { @@ -684,7 +793,19 @@ return 0; } break; - + case WM_INPUTLANGCHANGE: + fl_get_codepage(); + break; + case WM_IME_COMPOSITION: + if (!fl_is_nt4() && lParam & GCS_RESULTCLAUSE) { + HIMC himc = ImmGetContext(hWnd); + wlen = ImmGetCompositionStringW(himc, GCS_RESULTSTR, + wbuf, sizeof(wbuf)) / sizeof(short); + if (wlen < 0) wlen = 0; + wbuf[wlen] = 0; + ImmReleaseContext(hWnd, himc); + } + break; case WM_KEYDOWN: case WM_SYSKEYDOWN: case WM_KEYUP: @@ -692,7 +813,11 @@ // save the keysym until we figure out the characters: Fl::e_keysym = ms2fltk(wParam,lParam&(1<<24)); // See if TranslateMessage turned it into a WM_*CHAR message: - if (PeekMessage(&fl_msg, hWnd, WM_CHAR, WM_SYSDEADCHAR, PM_REMOVE)) { + if ((fl_is_nt4() && + PeekMessageW(&fl_msg, hWnd, WM_CHAR, WM_SYSDEADCHAR, PM_REMOVE)) || + (!fl_is_nt4() && + PeekMessage(&fl_msg, hWnd, WM_CHAR, WM_SYSDEADCHAR, PM_REMOVE))) + { uMsg = fl_msg.message; wParam = fl_msg.wParam; lParam = fl_msg.lParam; @@ -701,6 +826,16 @@ case WM_SYSDEADCHAR: case WM_CHAR: case WM_SYSCHAR: { + UINT cp = fl_codepage; + static char buffer[1024]; + static unsigned char lead[2] = {0, 0}; + if (!fl_is_nt4() && uMsg == WM_CHAR) { + if (!lead[0] && IsDBCSLeadByteEx(cp, (unsigned char)wParam)) + { + lead[0] = (unsigned char)wParam; + return 0; + } + } ulong state = Fl::e_state & 0xff000000; // keep the mouse button state // if GetKeyState is expensive we might want to comment some of these out: if (GetKeyState(VK_SHIFT)&~1) state |= FL_SHIFT; @@ -723,58 +858,91 @@ if (Fl::handle(FL_KEYUP, window)) return 0; break; } - static char buffer[2]; if (uMsg == WM_CHAR || uMsg == WM_SYSCHAR) { - buffer[0] = char(wParam); - Fl::e_length = 1; + int i = 0; + unsigned short ucs[10]; + int ulen = 0; + int len; + int l = 1; + if (fl_is_nt4()) { + xchar u = (xchar) wParam; + Fl::e_length = fl_unicode2utf(&u, 1, buffer); + buffer[Fl::e_length] = 0; + } else if (!fl_is_ime) { + if (lead[0]) { + lead[1] = (unsigned char) wParam; + l = 2; + } else { + lead[0] = (unsigned char) wParam; + } + len = MultiByteToWideChar(fl_codepage, MB_PRECOMPOSED, + (char*)lead, l, (wchar_t*)ucs, 10); + len = 1; + lead[0] = 0; + lead[1] = 0; + while (i < len) { + int l = fl_ucs2utf(ucs[i], buffer + ulen); + if (l > 0) ulen += l; + i++; + } + buffer[ulen] = '\0'; + Fl::e_length = ulen; + } else { + int l; + l = fl_unicode2utf((xchar*)wbuf, wlen, buffer); + if (l < 0) l = 0; + buffer[l] = 0; + Fl::e_length = l; + wlen = 0; + } } 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; + 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; - } + 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; @@ -788,7 +956,7 @@ case WM_MOUSEWHEEL: { static int delta = 0; // running total of all motion - delta += (SHORT)(HIWORD(wParam)); + delta += (SHORT)((wParam >> 16) & 0xFFFFF); Fl::e_dy = -delta / WHEEL_DELTA; delta += Fl::e_dy * WHEEL_DELTA; if (Fl::e_dy) Fl::handle(FL_MOUSEWHEEL, window); @@ -806,14 +974,14 @@ } else { Fl::handle(FL_SHOW, window); resize_bug_fix = window; - window->size(LOWORD(lParam), HIWORD(lParam)); + window->size((lParam & 0xFFFF), ((lParam >> 16) & 0xFFFF)); } } break; case WM_MOVE: resize_bug_fix = window; - window->position(LOWORD(lParam), HIWORD(lParam)); + window->position((lParam & 0xFFFF), ((lParam >> 16) & 0xFFFF)); break; case WM_SETCURSOR: @@ -838,6 +1006,7 @@ case WM_CREATE : fl_GetDC(hWnd); fl_select_palette(); + break; #endif @@ -854,13 +1023,29 @@ OpenClipboard(NULL); // fall through... case WM_RENDERFORMAT: { - HANDLE h = GlobalAlloc(GHND, fl_selection_length[1]+1); - if (h) { - LPSTR p = (LPSTR)GlobalLock(h); - memcpy(p, fl_selection_buffer[1], fl_selection_length[1]); - p[fl_selection_length[1]] = 0; - GlobalUnlock(h); - SetClipboardData(CF_TEXT, h); + HANDLE h; + if (fl_is_nt4()) { + int l = fl_utf_nb_char((unsigned char*)fl_selection_buffer[1], fl_selection_length[1]); + h = GlobalAlloc(GHND, (l+1) * sizeof(short)); + if (h) { + unsigned short *g = (unsigned short*) GlobalLock(h); + fl_utf2unicode((unsigned char *)fl_selection_buffer[1], + fl_selection_length[1], (xchar*)g); + g[l] = 0; + GlobalUnlock(h); + SetClipboardData(CF_UNICODETEXT, h); + } + } else { + h = GlobalAlloc(GHND, fl_selection_length[1]+1); + if (h) { + LPSTR p = (LPSTR)GlobalLock(h); + fl_selection_buffer[1][fl_selection_length[1]] = 0; + char *s = fl_utf82locale(fl_selection_buffer[1], fl_selection_length[1], 0); + memcpy(p, s, strlen(s)); + p[fl_selection_length[1]] = 0; + GlobalUnlock(h); + SetClipboardData(CF_TEXT, h); + } } // Windoze also seems unhappy if I don't do this. Documentation very // unclear on what is correct: @@ -871,7 +1056,14 @@ if (Fl::handle(0,0)) return 0; break; } - + if (fl_is_nt4()) { + return DefWindowProcW(hWnd, uMsg, wParam, lParam); + } + if (fl_aimm) { + LRESULT l = 0; + fl_aimm->OnDefWindowProc(hWnd, uMsg, wParam, lParam, &l); + if (l) return l; + } return DefWindowProc(hWnd, uMsg, wParam, lParam); } @@ -934,7 +1126,7 @@ //////////////////////////////////////////////////////////////// void Fl_Window::resize(int X,int Y,int W,int H) { - UINT flags = SWP_NOSENDCHANGING | SWP_NOZORDER; + UINT flags = SWP_NOSENDCHANGING | SWP_NOZORDER; int is_a_resize = (W != w() || H != h()); int resize_from_program = (this != resize_bug_fix); if (!resize_from_program) resize_bug_fix = 0; @@ -945,8 +1137,16 @@ flags |= SWP_NOMOVE; } if (is_a_resize) { + static int is_wm = 0; + if (!parent()) { + is_wm = 0; + if (shown() && !resize_from_program) is_wm = 1; + } Fl_Group::resize(X,Y,W,H); - if (shown()) {redraw(); i->wait_for_expose = 1;} + if (shown()) { + redraw(); + i->wait_for_expose = 1; + } } else { x(X); y(Y); flags |= SWP_NOSIZE; @@ -984,28 +1184,51 @@ if (!class_name) class_name =*/ "FLTK"; // create a "FLTK" WNDCLASS const char* message_name = "FLTK::ThreadWakeup"; + const wchar_t* class_namew = L"FLTK"; + const wchar_t* message_namew = L"FLTK::ThreadWakeup"; WNDCLASSEX wc; + WNDCLASSEXW wcw; // Documentation states a device context consumes about 800 bytes // of memory... so who cares? If 800 bytes per window is what it // takes to speed things up, I'm game. //wc.style = CS_HREDRAW | CS_VREDRAW | CS_CLASSDC | CS_DBLCLKS; - wc.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC | CS_DBLCLKS; - wc.lpfnWndProc = (WNDPROC)WndProc; - wc.cbClsExtra = wc.cbWndExtra = 0; - wc.hInstance = fl_display; - if (!w->icon()) - w->icon((void *)LoadIcon(NULL, IDI_APPLICATION)); - wc.hIcon = wc.hIconSm = (HICON)w->icon(); - wc.hCursor = fl_default_cursor = LoadCursor(NULL, IDC_ARROW); - //uchar r,g,b; Fl::get_color(FL_GRAY,r,g,b); - //wc.hbrBackground = (HBRUSH)CreateSolidBrush(RGB(r,g,b)); - wc.hbrBackground = NULL; - wc.lpszMenuName = NULL; - wc.lpszClassName = class_name; - wc.cbSize = sizeof(WNDCLASSEX); - RegisterClassEx(&wc); - if (!fl_wake_msg) fl_wake_msg = RegisterWindowMessage(message_name); + if (fl_is_nt4()) { + wcw.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC | CS_DBLCLKS; + wcw.lpfnWndProc = (WNDPROC)WndProc; + wcw.cbClsExtra = wcw.cbWndExtra = 0; + wcw.hInstance = fl_display; + if (!w->icon()) + w->icon((void *)LoadIcon(NULL, IDI_APPLICATION)); + wcw.hIcon = wcw.hIconSm = (HICON)w->icon(); + wcw.hCursor = fl_default_cursor = LoadCursor(NULL, IDC_ARROW); + //uchar r,g,b; Fl::get_color(FL_GRAY,r,g,b); + //wc.hbrBackground = (HBRUSH)CreateSolidBrush(RGB(r,g,b)); + wcw.hbrBackground = NULL; + wcw.lpszMenuName = NULL; + wcw.lpszClassName = class_namew; + wcw.cbSize = sizeof(WNDCLASSEXW); + RegisterClassExW(&wcw); + if (!fl_wake_msg) fl_wake_msg = RegisterWindowMessageW(message_namew); + } else { + wc.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC | CS_DBLCLKS; + wc.lpfnWndProc = (WNDPROC)WndProc; + wc.cbClsExtra = wc.cbWndExtra = 0; + wc.hInstance = fl_display; + if (!w->icon()) + w->icon((void *)LoadIcon(NULL, IDI_APPLICATION)); + wc.hIcon = wc.hIconSm = (HICON)w->icon(); + wc.hCursor = fl_default_cursor = LoadCursor(NULL, IDC_ARROW); + //uchar r,g,b; Fl::get_color(FL_GRAY,r,g,b); + //wc.hbrBackground = (HBRUSH)CreateSolidBrush(RGB(r,g,b)); + wc.hbrBackground = NULL; + wc.lpszMenuName = NULL; + wc.lpszClassName = class_name; + wc.cbSize = sizeof(WNDCLASSEX); + RegisterClassEx(&wc); + if (!fl_wake_msg) fl_wake_msg = RegisterWindowMessage(message_name); +} + HWND parent; DWORD style = WS_CLIPCHILDREN | WS_CLIPSIBLINGS; @@ -1079,15 +1302,39 @@ x->region = 0; x->private_dc = 0; x->cursor = fl_default_cursor; - x->xid = CreateWindowEx( - styleEx, - class_name, w->label(), style, - xp, yp, wp, hp, - parent, - NULL, // menu - fl_display, - NULL // creation parameters - ); + if (!fl_codepage) fl_get_codepage(); + + if (fl_is_nt4()) { + WCHAR *lab = NULL; + if (w->label()) { + int l = strlen(w->label()); + lab = (WCHAR*) malloc((l + 1) * sizeof(short)); + l = fl_utf2unicode((unsigned char*)w->label(), l, (xchar*)lab); + lab[l] = 0; + } + x->xid = CreateWindowExW( + styleEx, + class_namew, lab, style, + xp, yp, wp, hp, + parent, + NULL, // menu + fl_display, + NULL // creation parameters + ); + if (lab) free(lab); + } else { + char *lab; + lab = fl_utf82locale(w->label(), strlen(w->label()), 0); + x->xid = CreateWindowEx( + styleEx, + class_name, lab, style, + xp, yp, wp, hp, + parent, + NULL, // menu + fl_display, + NULL // creation parameters + ); + } x->next = Fl_X::first; Fl_X::first = x; @@ -1097,12 +1344,16 @@ w->set_visible(); w->handle(FL_SHOW); // get child windows to appear w->redraw(); // force draw to happen - } + } + + // enable D'n'D Drop Files + //DragAcceptFiles(x->xid, TRUE); + // If we've captured the mouse, we dont want do activate any // other windows from the code, or we loose the capture. ShowWindow(x->xid, !showit ? SW_SHOWMINNOACTIVE : (Fl::grab() || (style & WS_POPUP)) ? SW_SHOWNOACTIVATE : SW_SHOWNORMAL); - + // Drag-n-drop requires GCC 3.x or a non-GNU compiler... #if !defined(__GNUC__) || __GNUC__ >= 3 // Register all windows for potential drag'n'drop operations @@ -1110,6 +1361,17 @@ if (!oleInitialized) { OleInitialize(0L); oleInitialized=1; } RegisterDragDrop(x->xid, flIDropTarget); + + if (!fl_aimm) { + static char been_here = 0; + if (!been_here && !oleInitialized) CoInitialize(NULL); + been_here = 1; + CoCreateInstance(CLSID_CActiveIMM, NULL, CLSCTX_INPROC_SERVER, + IID_IActiveIMMApp, (void**) &fl_aimm); + if (fl_aimm) { + fl_aimm->Activate(TRUE); + } + } #endif // !__GNUC__ || __GNUC__ >= 3 if (w->modal()) {Fl::modal_ = w; fl_fix_focus();} @@ -1162,11 +1424,22 @@ void Fl_Window::label(const char *name,const char *iname) { Fl_Widget::label(name); iconlabel_ = iname; + if (shown() && !parent()) { if (!name) name = ""; - SetWindowText(i->xid, name); - // if (!iname) iname = fl_filename_name(name); - // should do something with iname here... + if (fl_is_nt4()) { + int l = strlen(name); + WCHAR *lab = (WCHAR*) malloc((l + 1) * sizeof(short)); + l = fl_utf2unicode((unsigned char*)name, l, (xchar*)lab); + lab[l] = 0; + SetWindowTextW(i->xid, lab); + free(lab); + } else { + char *t = fl_utf82locale(name, strlen(name), 0); + SetWindowTextA(i->xid, t); + // if (!iname) iname = fl_filename_name(name); + // should do something with iname here... + } } } @@ -1205,10 +1478,10 @@ Fl_Window *Fl_Window::current_; // the current context -HDC fl_gc = 0; +FL_EXPORT HDC fl_gc = 0; // the current window handle, initially set to -1 so we can correctly // allocate fl_GetDC(0) -HWND fl_window = (HWND)-1; +FL_EXPORT HWND fl_window = (HWND)-1; // Here we ensure only one GetDC is ever in place. HDC fl_GetDC(HWND w) { @@ -1242,5 +1515,5 @@ } // -// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.51 2004/10/19 18:21:52 easysw Exp $". +// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.37 2002/07/01 20:14:08 easysw Exp $". // diff -ur -- fltk-1.1.6/src/Fl_x.cxx fltk-utf8-1.1.6/src/Fl_x.cxx --- fltk-1.1.6/src/Fl_x.cxx 2004-11-20 13:52:47.000000000 +0000 +++ fltk-utf8-1.1.6/src/Fl_x.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: Fl_x.cxx,v 1.24.2.24.2.40 2004/11/20 13:52:47 easysw Exp $" +// "$Id: Fl_x.cxx,v 1.24.2.24.2.23 2002/08/09 03:17:30 easysw Exp $" // // X specific code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2002 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 @@ -33,14 +33,22 @@ /**** Define this if your keyboard lacks a backspace key... ****/ /* #define BACKSPACE_HACK 1 */ +# include # include # include # include +# include # include # include # include "flstring.h" # include # include +# include +# include +# include + +const char* Fl::txt_xio_error = "X I/O error"; +const char* Fl::txt_cannot_open_display = "Can't open display: %s"; //////////////////////////////////////////////////////////////// // interface to poll/select call: @@ -263,16 +271,21 @@ //////////////////////////////////////////////////////////////// Display *fl_display; -Window fl_message_window; +Window fl_message_window = 0; int fl_screen; XVisualInfo *fl_visual; Colormap fl_colormap; +XIM fl_xim_im = 0; +XIC fl_xim_ic = 0; +char fl_is_over_the_spot = 0; +static XRectangle status_area; static Atom WM_DELETE_WINDOW; static Atom WM_PROTOCOLS; static Atom fl_MOTIF_WM_HINTS; static Atom TARGETS; static Atom CLIPBOARD; + Atom fl_XdndAware; Atom fl_XdndSelection; Atom fl_XdndEnter; @@ -283,8 +296,9 @@ Atom fl_XdndStatus; Atom fl_XdndActionCopy; Atom fl_XdndFinished; -//Atom fl_XdndProxy; - +Atom fl_XdndProxy; +Atom fl_XaUtf8String; +Atom fl_XaTextUriList; static void fd_callback(int,void *) { do_queued_events(); @@ -292,7 +306,7 @@ extern "C" { static int io_error_handler(Display*) { - Fl::fatal("X I/O error"); + Fl::fatal(Fl::txt_xio_error); return 0; } @@ -306,14 +320,206 @@ } } +extern char *fl_get_font_xfld(int fnum, int size); + +void fl_new_ic() +{ + XVaNestedList preedit_attr = NULL; + XVaNestedList status_attr = NULL; + static XFontSet fs = NULL; + char *fnt; + char **missing_list; + int missing_count; + char *def_string; + static XRectangle spot; + int predit = 0; + int sarea = 0; + XIMStyles* xim_styles = NULL; + + if (!fs) { + fnt = fl_get_font_xfld(0, 14); + if (!fnt) fnt = "-misc-fixed-*"; + fs = XCreateFontSet(fl_display, fnt, &missing_list, + &missing_count, &def_string); + } + preedit_attr = XVaCreateNestedList(0, + XNSpotLocation, &spot, + XNFontSet, fs, NULL); + status_attr = XVaCreateNestedList(0, + XNAreaNeeded, &status_area, + XNFontSet, fs, NULL); + + if (!XGetIMValues (fl_xim_im, XNQueryInputStyle, + &xim_styles, NULL, NULL)) + { + int i; + XIMStyle *style; + for (i = 0, style = xim_styles->supported_styles; + i < xim_styles->count_styles; i++, style++) + { + if (*style == (XIMPreeditPosition | XIMStatusArea)) { + sarea = 1; + predit = 1; + } else if (*style == + (XIMPreeditPosition | XIMStatusNothing)) + { + predit = 1; + } + + } + } + XFree(xim_styles); + + if (sarea) fl_xim_ic = XCreateIC(fl_xim_im, + XNInputStyle, (XIMPreeditPosition | XIMStatusArea), + XNPreeditAttributes, preedit_attr, + XNStatusAttributes, status_attr, + NULL); + + if (!fl_xim_ic && predit) { + fl_xim_ic = XCreateIC(fl_xim_im, + XNInputStyle, (XIMPreeditPosition | XIMStatusNothing), + XNPreeditAttributes, preedit_attr, + NULL); + } + XFree(preedit_attr); + XFree(status_attr); + if (!fl_xim_ic) { + fl_is_over_the_spot = 0; + fl_xim_ic = XCreateIC(fl_xim_im, + XNInputStyle, (XIMPreeditNothing | XIMStatusNothing), + NULL); + } else { + fl_is_over_the_spot = 1; + XVaNestedList status_attr = NULL; + status_attr = XVaCreateNestedList(0, XNAreaNeeded, &status_area, NULL); + + XGetICValues(fl_xim_ic, XNStatusAttributes, status_attr, NULL); + XFree(status_attr); + } +} + + +static XRectangle spot; +static int spotf = -1; +static int spots = -1; + +void fl_reset_spot(void) +{ + spot.x = -1; + spot.y = -1; + //if (fl_xim_ic) XUnsetICFocus(fl_xim_ic); +} + +void fl_set_spot(int font, int size, int x, int y, int w, int h) +{ + int change = 0; + XVaNestedList preedit_attr; + static XFontSet fs = NULL; + char **missing_list; + int missing_count; + char *def_string; + char *fnt; + static XIC ic = NULL; + + if (!fl_xim_ic || !fl_is_over_the_spot) return; + //XSetICFocus(fl_xim_ic); + if (x != spot.x || y != spot.y) { + spot.x = x; + spot.y = y; + spot.height = h; + spot.width = w; + change = 1; + } + if (font != spotf || size != spots) { + spotf = font; + spots = size; + change = 1; + if (fs) { + XFreeFontSet(fl_display, fs); + } + fnt = fl_get_font_xfld(font, size); + if (!fnt) fnt = "-misc-fixed-*"; + fs = XCreateFontSet(fl_display, fnt, &missing_list, + &missing_count, &def_string); + free(fnt); + } + if (fl_xim_ic != ic) { + ic = fl_xim_ic; + change = 1; + } + + if (!change) return; + + + preedit_attr = XVaCreateNestedList(0, + XNSpotLocation, &spot, + XNFontSet, fs, NULL); + XSetICValues(fl_xim_ic, XNPreeditAttributes, preedit_attr, NULL); + XFree(preedit_attr); +} + +void fl_set_status(int x, int y, int w, int h) +{ + XVaNestedList status_attr; + status_area.x = x; + status_area.y = y; + status_area.width = w; + status_area.height = h; + if (!fl_xim_ic) return; + status_attr = XVaCreateNestedList(0, XNArea, &status_area, NULL); + + XSetICValues(fl_xim_ic, XNStatusAttributes, status_attr, NULL); + XFree(status_attr); +} + +void fl_init_xim() +{ + //XIMStyle *style; + XIMStyles *xim_styles; + if (!fl_display) return; + if (fl_xim_im) return; + + fl_xim_im = XOpenIM(fl_display, NULL, NULL, NULL); + xim_styles = NULL; + fl_xim_ic = NULL; + + if (fl_xim_im) { + XGetIMValues (fl_xim_im, XNQueryInputStyle, + &xim_styles, NULL, NULL); + } else { + Fl::warning("XOpenIM() failed\n"); + return; + } + + if (xim_styles && xim_styles->count_styles) { + fl_new_ic(); + } else { + Fl::warning("No XIM style found\n"); + XCloseIM(fl_xim_im); + fl_xim_im = NULL; + return; + } + if (!fl_xim_ic) { + Fl::warning("XCreateIC() failed\n"); + XCloseIM(fl_xim_im); + XFree(xim_styles); + fl_xim_im = NULL; + } +} + + void fl_open_display() { if (fl_display) return; + setlocale(LC_CTYPE, ""); + XSetLocaleModifiers(""); + XSetIOErrorHandler(io_error_handler); XSetErrorHandler(xerror_handler); Display *d = XOpenDisplay(0); - if (!d) Fl::fatal("Can't open display: %s",XDisplayName(0)); + if (!d) Fl::fatal(Fl::txt_cannot_open_display,XDisplayName(0)); fl_open_display(d); } @@ -336,20 +542,23 @@ fl_XdndStatus = XInternAtom(d, "XdndStatus", 0); fl_XdndActionCopy = XInternAtom(d, "XdndActionCopy", 0); fl_XdndFinished = XInternAtom(d, "XdndFinished", 0); - //fl_XdndProxy = XInternAtom(d, "XdndProxy", 0); + fl_XdndProxy = XInternAtom(d, "XdndProxy", 0); + fl_XaUtf8String = XInternAtom(d, "UTF8_STRING", 0); + fl_XaTextUriList = XInternAtom(d, "text/uri-list", 0); - Fl::add_fd(ConnectionNumber(d), POLLIN, fd_callback); + Fl::add_fd(ConnectionNumber(d), POLLIN, fd_callback); fl_screen = DefaultScreen(d); - fl_message_window = XCreateSimpleWindow(d, RootWindow(d,fl_screen), 0,0,1,1,0, 0, 0); + // construct an XVisualInfo that matches the default Visual: XVisualInfo templt; int num; - templt.visualid = XVisualIDFromVisual(DefaultVisual(d, fl_screen)); + templt.visualid = XVisualIDFromVisual(DefaultVisual(d,fl_screen)); fl_visual = XGetVisualInfo(d, VisualIDMask, &templt, &num); - fl_colormap = DefaultColormap(d, fl_screen); + fl_colormap = DefaultColormap(fl_display,fl_screen); + fl_init_xim(); #if !USE_COLORMAP Fl::visual(FL_RGB); @@ -387,7 +596,7 @@ char *fl_selection_buffer[2]; int fl_selection_length[2]; int fl_selection_buffer_length[2]; -char fl_i_own_selection[2]; +char fl_i_own_selection[2] = {0,0}; // Call this when a "paste" operation happens: void Fl::paste(Fl_Widget &receiver, int clipboard) { @@ -404,7 +613,7 @@ // otherwise get the window server to return it: fl_selection_requestor = &receiver; Atom property = clipboard ? CLIPBOARD : XA_PRIMARY; - XConvertSelection(fl_display, property, XA_STRING, property, + XConvertSelection(fl_display, property, fl_XaUtf8String, property, fl_xid(Fl::first_window()), fl_event_time); } @@ -498,6 +707,7 @@ } static Fl_Window* resize_bug_fix; +extern int (*fl_local_grab)(int); // in Fl.cxx extern "C" { static Bool fake_keyup_test(Display*, XEvent* event, char* previous) { @@ -509,12 +719,78 @@ } //////////////////////////////////////////////////////////////// - -int fl_handle(const XEvent& thisevent) +int fl_handle(const XEvent &thisevent) { XEvent xevent = thisevent; fl_xevent = &thisevent; Window xid = xevent.xany.window; + int filtered = 0; + static Window xim_win = 0; + + if (fl_xim_ic && xevent.type == DestroyNotify && + xid != xim_win && !fl_find(xid)) + { + XIM xim_im; + xim_im = XOpenIM(fl_display, NULL, NULL, NULL); + if (!xim_im) { + /* XIM server has crashed */ + XSetLocaleModifiers("@im="); + fl_xim_im = NULL; + fl_init_xim(); + } else { + // XCloseIM(xim_im); FIXME + /* XFree86 has a bug when closing IM it crashes in + * _XlcCreateDefaultCharSet() ! So don't close it. + * This will cause a memory leak :-( + */ + } + return 0; + } + + if (fl_xim_ic && (xevent.type == FocusIn)) + { +#define POOR_XIM +#ifdef POOR_XIM + if (xim_win != xid) + { + xim_win = xid; + XDestroyIC(fl_xim_ic); + fl_xim_ic = NULL; + fl_new_ic(); + XSetICValues(fl_xim_ic, + XNFocusWindow, xevent.xclient.window, + XNClientWindow, xid, + NULL); + } + fl_set_spot(spotf, spots, spot.x, spot.y, spot.width, spot.height); +#else + if (Fl::first_window() && Fl::first_window()->modal()) { + Window x = fl_xid(Fl::first_window()); + if (x != xim_win) { + xim_win = x; + XSetICValues(fl_xim_ic, + XNFocusWindow, xim_win, + XNClientWindow, xim_win, + NULL); + fl_set_spot(spotf, spots, spot.x, spot.y, spot.width, spot.height); + } + } else if (xim_win != xid && xid) { + xim_win = xid; + XSetICValues(fl_xim_ic, + XNFocusWindow, xevent.xclient.window, + XNClientWindow, xid, + //XNFocusWindow, xim_win, + //XNClientWindow, xim_win, + NULL); + fl_set_spot(spotf, spots, spot.x, spot.y, spot.width, spot.height); + } +#endif + } + + filtered = XFilterEvent((XEvent *)&xevent, 0); + if (filtered) { + return 1; + } switch (xevent.type) { @@ -528,7 +804,7 @@ case SelectionNotify: { if (!fl_selection_requestor) return 0; - static unsigned char* buffer; + static unsigned char* buffer = 0; if (buffer) {XFree(buffer); buffer = 0;} long bytesread = 0; if (fl_xevent->xselection.property) for (;;) { @@ -551,20 +827,23 @@ buffer = portion; } bytesread += count*format/8; + buffer[bytesread] = 0; if (!remaining) break; } Fl::e_text = buffer ? (char*)buffer : (char *)""; Fl::e_length = bytesread; - fl_selection_requestor->handle(FL_PASTE); // Detect if this paste is due to Xdnd by the property name (I use // XA_SECONDARY for that) and send an XdndFinished message. It is not // clear if this has to be delayed until now or if it can be done // immediatly after calling XConvertSelection. if (fl_xevent->xselection.property == XA_SECONDARY && fl_dnd_source_window) { + fl_selection_requestor->handle(FL_DROP); fl_sendClientMessage(fl_dnd_source_window, fl_XdndFinished, fl_xevent->xselection.requestor); fl_dnd_source_window = 0; // don't send a second time + } else { + fl_selection_requestor->handle(FL_PASTE); } return 1;} @@ -583,7 +862,7 @@ e.time = fl_xevent->xselectionrequest.time; e.property = fl_xevent->xselectionrequest.property; if (e.target == TARGETS) { - Atom a = XA_STRING; + Atom a = fl_XaUtf8String; //XA_STRING; XChangeProperty(fl_display, e.requestor, e.property, XA_ATOM, sizeof(Atom)*8, 0, (unsigned char*)&a, sizeof(Atom)); @@ -619,12 +898,15 @@ int event = 0; Fl_Window* window = fl_find(xid); + static Fl_Widget *dnd_rec = NULL; if (window) switch (xevent.type) { case ClientMessage: { Atom message = fl_xevent->xclient.message_type; const long* data = fl_xevent->xclient.data.l; + + if (Fl::pushed()) Fl::pushed()->handle(0); if ((Atom)(data[0]) == WM_DELETE_WINDOW) { event = FL_CLOSE; } else if (message == fl_XdndEnter) { @@ -643,8 +925,9 @@ goto FAILED; delete [] fl_dnd_source_types; fl_dnd_source_types = new Atom[count+1]; - for (unsigned i = 0; i < count; i++) + for (unsigned i = 0; i < count; i++) { fl_dnd_source_types[i] = ((Atom*)buffer)[i]; + } fl_dnd_source_types[count] = 0; } else { FAILED: @@ -655,7 +938,7 @@ fl_dnd_source_types[2] = data[4]; fl_dnd_source_types[3] = 0; } - fl_dnd_type = fl_dnd_source_types[0]; // should pick text or url + fl_dnd_type = fl_XaTextUriList; //fl_dnd_source_types[0]; event = FL_DND_ENTER; break; @@ -673,6 +956,8 @@ fl_dnd_source_action = data[4]; fl_dnd_action = fl_XdndActionCopy; int accept = Fl::handle(FL_DND_DRAG, window); + dnd_rec = Fl::belowmouse(); + if (!dnd_rec) dnd_rec = window; fl_sendClientMessage(data[0], fl_XdndStatus, fl_xevent->xclient.window, accept ? 1 : 0, @@ -692,7 +977,7 @@ fl_dnd_source_window = data[0]; fl_event_time = data[2]; Window to_window = fl_xevent->xclient.window; - if (Fl::handle(FL_DND_RELEASE, window)) { + if (dnd_rec && dnd_rec->handle(FL_DND_RELEASE)) { fl_selection_requestor = Fl::belowmouse(); XConvertSelection(fl_display, fl_XdndSelection, fl_dnd_type, XA_SECONDARY, @@ -705,6 +990,7 @@ fl_sendClientMessage(fl_dnd_source_window, fl_XdndFinished, to_window); fl_dnd_source_window = 0; } + dnd_rec = NULL; return 1; } @@ -729,10 +1015,12 @@ return 1; case FocusIn: + if (fl_xim_ic) XSetICFocus(fl_xim_ic); event = FL_FOCUS; break; case FocusOut: + if (fl_xim_ic) XUnsetICFocus(fl_xim_ic); event = FL_UNFOCUS; break; @@ -741,30 +1029,56 @@ KEYPRESS: int keycode = xevent.xkey.keycode; fl_key_vector[keycode/8] |= (1 << (keycode%8)); - static char buffer[21]; + static char *buffer = NULL; + static int buffer_len = 0; int len; KeySym keysym; + if (buffer_len == 0) { + buffer_len = 4096; + buffer = (char*) malloc(buffer_len); + } if (xevent.type == KeyPress) { event = FL_KEYDOWN; - //static XComposeStatus compose; - len = XLookupString((XKeyEvent*)&(xevent.xkey), - buffer, 20, &keysym, 0/*&compose*/); - if (keysym && keysym < 0x400) { // a character in latin-1,2,3,4 sets - // force it to type a character (not sure if this ever is needed): - if (!len) {buffer[0] = char(keysym); len = 1;} - // ignore all effects of shift on the keysyms, which makes it a lot - // easier to program shortcuts and is Windoze-compatable: - keysym = XKeycodeToKeysym(fl_display, keycode, 0); + int len = 0; + + if (fl_xim_ic) { + if (!filtered) { + Status status; + len = XUtf8LookupString(fl_xim_ic, (XKeyPressedEvent *)&xevent.xkey, + buffer, buffer_len, &keysym, &status); + + while (status == XBufferOverflow && buffer_len < 50000) { + buffer_len = buffer_len * 5 + 1; + buffer = (char*)realloc(buffer, buffer_len); + len = XUtf8LookupString(fl_xim_ic, (XKeyPressedEvent *)&xevent.xkey, + buffer, buffer_len, &keysym, &status); + } + } else { + keysym = XKeycodeToKeysym(fl_display, keycode, 0); + } + } else { + //static XComposeStatus compose; + len = XLookupString((XKeyEvent*)&(xevent.xkey), + buffer, buffer_len, &keysym, 0/*&compose*/); + if (keysym && keysym < 0x400) { // a character in latin-1,2,3,4 sets + // force it to type a character (not sure if this ever is needed): + // if (!len) {buffer[0] = char(keysym); len = 1;} + len = fl_ucs2utf(XKeysymToUcs(keysym), buffer); + if (len < 1) len = 1; + // ignore all effects of shift on the keysyms, which makes it a lot + // easier to program shortcuts and is Windoze-compatable: + keysym = XKeycodeToKeysym(fl_display, keycode, 0); + } } // MRS: Can't use Fl::event_state(FL_CTRL) since the state is not // set until set_event_xy() is called later... - if ((xevent.xkey.state & ControlMask) && keysym == '-') buffer[0] = 0x1f; // ^_ + if ((xevent.xkey.state & ControlMask) && keysym == '-') buffer[0] = 0x1f; buffer[len] = 0; Fl::e_text = buffer; Fl::e_length = len; } else { // Stupid X sends fake key-up events when a repeating key is held - // down, probably due to some back compatability problem. Fortunately + // down, probably due to some back compatability problem. Fortunatley // we can detect this because the repeating KeyPress event is in // the queue, get it and execute it instead: XEvent temp; @@ -790,7 +1104,7 @@ // Attempt to fix keyboards that send "delete" for the key in the // upper-right corner of the main keyboard. But it appears that // very few of these remain? - static int got_backspace; + static int got_backspace = 0; if (!got_backspace) { if (keysym == FL_Delete) keysym = FL_BackSpace; else if (keysym == FL_BackSpace) got_backspace = 1; @@ -800,17 +1114,19 @@ // not produced on Windoze and thus case statements tend not to check // for them. There are 15 of these in the range 0xff91 ... 0xff9f if (keysym >= 0xff91 && keysym <= 0xff9f) { - // Map keypad keysym to character or keysym depending on - // numlock state... + // Try to make them turn into FL_KP+'c' so that NumLock is + // irrelevant, by looking at the shifted code. This matches the + // behavior of the translator in Fl_win32.cxx, and IMHO is the + // user-friendly result: unsigned long keysym1 = XKeycodeToKeysym(fl_display, keycode, 1); if ((xevent.xkey.state & Mod2Mask) && (keysym1 <= 0x7f || (keysym1 > 0xff9f && keysym1 <= FL_KP_Last))) { - // Store ASCII numeric keypad value... + // Store ASCII numeric keypad value... keysym = keysym1 | FL_KP; buffer[0] = char(keysym1) & 0x7F; len = 1; } else { - // Map keypad to special key... + // Map keypad to special key... static const unsigned short table[15] = { FL_F+1, FL_F+2, FL_F+3, FL_F+4, FL_Home, FL_Left, FL_Up, FL_Right, @@ -904,15 +1220,22 @@ XWindowAttributes actual; XGetWindowAttributes(fl_display, fl_xid(window), &actual); Window cr; int X, Y, W = actual.width, H = actual.height; - XTranslateCoordinates(fl_display, fl_xid(window), actual.root, + XTranslateCoordinates(fl_display, fl_xid(window), + RootWindow(fl_display, fl_screen), 0, 0, &X, &Y, &cr); + if (event == FL_SHOW) { + if (window->x() > 0 && window->y() > 0) { + X = window->x(); + Y = window->y(); + } + XMoveWindow(fl_display, fl_xid(window), X, Y); + } // tell Fl_Window about it and set flag to prevent echoing: resize_bug_fix = window; window->resize(X, Y, W, H); break; // allow add_handler to do something too } - case ReparentNotify: { int xpos, ypos; Window junk; @@ -920,9 +1243,9 @@ //ReparentNotify gives the new position of the window relative to //the new parent. FLTK cares about the position on the root window. XTranslateCoordinates(fl_display, xevent.xreparent.parent, - XRootWindow(fl_display, fl_screen), - xevent.xreparent.x, xevent.xreparent.y, - &xpos, &ypos, &junk); + XRootWindow(fl_display, fl_screen), + xevent.xreparent.x, xevent.xreparent.y, + &xpos, &ypos, &junk); // tell Fl_Window about it and set flag to prevent echoing: resize_bug_fix = window; @@ -930,7 +1253,6 @@ break; } } - return Fl::handle(event, window); } @@ -958,9 +1280,9 @@ if (is_a_resize) { if (!resizable()) size_range(w(),h(),w(),h()); if (is_a_move) { - XMoveResizeWindow(fl_display, i->xid, X, Y, W>0 ? W : 1, H>0 ? H : 1); + XMoveResizeWindow(fl_display, i->xid, X, Y, W>0 ? W : 1, H>0 ? H : 1); } else { - XResizeWindow(fl_display, i->xid, W>0 ? W : 1, H>0 ? H : 1); + XResizeWindow(fl_display, i->xid, W>0 ? W : 1, H>0 ? H : 1); } } else XMoveWindow(fl_display, i->xid, X, Y); @@ -999,13 +1321,15 @@ static const int childEventMask = ExposureMask; -static const int XEventMask = +static const long XEventMask = ExposureMask|StructureNotifyMask |KeyPressMask|KeyReleaseMask|KeymapStateMask|FocusChangeMask |ButtonPressMask|ButtonReleaseMask |EnterWindowMask|LeaveWindowMask |PointerMotionMask; +int fl_show_it = 1; + void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap) { Fl_Group::current(0); // get rid of very common user bug: forgot end() @@ -1017,8 +1341,8 @@ int H = win->h(); if (H <= 0) H = 1; // X don't like zero... if (!win->parent() && !Fl::grab()) { - // center windows in case window manager does not do anything: #ifdef FL_CENTER_WINDOWS + // center windows in case window manager does not do anything: if (!(win->flags() & Fl_Window::FL_FORCE_POSITION)) { win->x(X = (Fl::w()-W)/2); win->y(Y = (Fl::h()-H)/2); @@ -1072,14 +1396,13 @@ Fl_X* xp = set_xid(win, XCreateWindow(fl_display, - root, - X, Y, W, H, - 0, // borderwidth - visual->depth, - InputOutput, - visual->visual, - mask, &attr)); - int showit = 1; + root, + X, Y, W, H, + 0, // borderwidth + visual->depth, + InputOutput, + visual->visual, + mask, &attr)); if (!win->parent() && !attr.override_redirect) { // Communicate all kinds 'o junk to the X Window Manager: @@ -1089,6 +1412,11 @@ XChangeProperty(fl_display, xp->xid, WM_PROTOCOLS, XA_ATOM, 32, 0, (uchar*)&WM_DELETE_WINDOW, 1); + // Make it receptive to DnD: + long version = 4; + XChangeProperty(fl_display, xp->xid, fl_XdndAware, + XA_ATOM, sizeof(int)*8, 0, (unsigned char*)&version, 1); + // send size limits and border: xp->sendxjunk(); @@ -1112,14 +1440,9 @@ Fl_Window* wp = xp->next->w; while (wp->parent()) wp = wp->window(); XSetTransientForHint(fl_display, xp->xid, fl_xid(wp)); - if (!wp->visible()) showit = 0; // guess that wm will not show it + if (!wp->visible()) fl_show_it = 0; // guess that wm will not show it } - // Make it receptive to DnD: - long version = 4; - XChangeProperty(fl_display, xp->xid, fl_XdndAware, - XA_ATOM, sizeof(int)*8, 0, (unsigned char*)&version, 1); - XWMHints *hints = XAllocWMHints(); hints->input = True; hints->flags = InputHint; @@ -1127,7 +1450,7 @@ hints->flags |= StateHint; hints->initial_state = IconicState; fl_show_iconic = 0; - showit = 0; + fl_show_it = 0; } if (win->icon()) { hints->icon_pixmap = (Pixmap)win->icon(); @@ -1138,11 +1461,12 @@ } XMapWindow(fl_display, xp->xid); - if (showit) { + if (fl_show_it) { win->set_visible(); win->handle(FL_SHOW); // get child windows to appear win->redraw(); } + fl_show_it = 1; } //////////////////////////////////////////////////////////////// @@ -1243,10 +1567,10 @@ if (shown() && !parent()) { if (!name) name = ""; XChangeProperty(fl_display, i->xid, XA_WM_NAME, - XA_STRING, 8, 0, (uchar*)name, strlen(name)); + fl_XaUtf8String, 8, 0, (uchar*)name, strlen(name)); if (!iname) iname = fl_filename_name(name); XChangeProperty(fl_display, i->xid, XA_WM_ICON_NAME, - XA_STRING, 8, 0, (uchar*)iname, strlen(iname)); + fl_XaUtf8String, 8, 0, (uchar*)iname, strlen(iname)); } } @@ -1299,5 +1623,5 @@ #endif // -// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.40 2004/11/20 13:52:47 easysw Exp $". +// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.23 2002/08/09 03:17:30 easysw Exp $". // diff -ur -- fltk-1.1.6/src/Makefile fltk-utf8-1.1.6/src/Makefile --- fltk-1.1.6/src/Makefile 2004-11-20 03:19:58.000000000 +0000 +++ fltk-utf8-1.1.6/src/Makefile 2005-06-28 15:33:34.000000000 +0100 @@ -146,7 +146,11 @@ fl_shortcut.cxx \ fl_show_colormap.cxx \ fl_symbols.cxx \ - fl_vertex.cxx + fl_vertex.cxx \ + Fl_Shaped_Window.cxx \ + Fl_Table.cxx \ + Fl_Tree.cxx \ + fl_utf8.cxx FLCPPFILES = \ forms_compatability.cxx \ @@ -199,35 +203,35 @@ $(LIBCOMMAND) $@ $(OBJECTS) $(RANLIB) $@ -libfltk.so.1.1: $(OBJECTS) +libfltk-utf8.so.1.1: $(OBJECTS) echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(OBJECTS) - $(RM) libfltk.so - $(LN) libfltk.so.1.1 libfltk.so + $(RM) libfltk-utf8.so + $(LN) libfltk-utf8.so.1.1 libfltk-utf8.so -libfltk.sl.1.1: $(OBJECTS) +libfltk-utf8.sl.1.1: $(OBJECTS) echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(OBJECTS) - $(RM) libfltk.sl - $(LN) libfltk.sl.1.1 libfltk.sl + $(RM) libfltk-utf8.sl + $(LN) libfltk-utf8.sl.1.1 libfltk-utf8.sl -libfltk.1.1.dylib: $(OBJECTS) +libfltk-utf8.1.1.dylib: $(OBJECTS) echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ \ -install_name $(libdir)/$@ \ -current_version 1.1.4 \ -compatibility_version 1.1.0 \ $(OBJECTS) $(LDLIBS) - $(RM) libfltk.dylib - $(LN) libfltk.1.1.dylib libfltk.dylib + $(RM) libfltk-utf8.dylib + $(LN) libfltk-utf8.1.1.dylib libfltk-utf8.dylib -libfltk_s.a: $(OBJECTS) - echo $(DSOCOMMAND) libfltk_s.o ... - $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) - echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o +libfltk-utf8_s.a: $(OBJECTS) + echo $(DSOCOMMAND) libfltk-utf8_s.o ... + $(DSOCOMMAND) libfltk-utf8_s.o $(OBJECTS) $(IMAGELIBS) + echo $(LIBCOMMAND) libfltk-utf8_s.a libfltk-utf8_s.o $(RM) $@ - $(LIBCOMMAND) libfltk_s.a libfltk_s.o - $(CHMOD) +x libfltk_s.a + $(LIBCOMMAND) libfltk-utf8_s.a libfltk-utf8_s.o + $(CHMOD) +x libfltk-utf8_s.a $(FLLIBNAME): $(FLOBJECTS) echo $(LIBCOMMAND) $@ ... @@ -235,35 +239,35 @@ $(LIBCOMMAND) $@ $(FLOBJECTS) $(RANLIB) $@ -libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1 +libfltk-utf8_forms.so.1.1: $(FLOBJECTS) libfltk-utf8.so.1.1 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk - $(RM) libfltk_forms.so - $(LN) libfltk_forms.so.1.1 libfltk_forms.so + $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk-utf8 + $(RM) libfltk-utf8_forms.so + $(LN) libfltk-utf8_forms.so.1.1 libfltk-utf8_forms.so -libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1 +libfltk-utf8_forms.sl.1.1: $(FLOBJECTS) libfltk-utf8.sl.1.1 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk - $(RM) libfltk_forms.sl - $(LN) libfltk_forms.sl.1.1 libfltk_forms.sl + $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk-utf8 + $(RM) libfltk-utf8_forms.sl + $(LN) libfltk-utf8_forms.sl.1.1 libfltk-utf8_forms.sl -libfltk_forms.1.1.dylib: $(FLOBJECTS) libfltk.1.1.dylib +libfltk-utf8_forms.1.1.dylib: $(FLOBJECTS) libfltk-utf8.1.1.dylib echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ \ -install_name $(libdir)/$@ \ -current_version 1.1.4 \ -compatibility_version 1.1.0 \ - $(FLOBJECTS) -L. $(LDLIBS) -lfltk - $(RM) libfltk_forms.dylib - $(LN) libfltk_forms.1.1.dylib libfltk_forms.dylib - -libfltk_forms_s.a: $(FLOBJECTS) - echo $(DSOCOMMAND) libfltk_forms_s.o ... - $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) - echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o + $(FLOBJECTS) -L. $(LDLIBS) -lfltk-utf8 + $(RM) libfltk-utf8_forms.dylib + $(LN) libfltk-utf8_forms.1.1.dylib libfltk-utf8_forms.dylib + +libfltk-utf8_forms_s.a: $(FLOBJECTS) + echo $(DSOCOMMAND) libfltk-utf8_forms_s.o ... + $(DSOCOMMAND) libfltk-utf8_forms_s.o $(FLOBJECTS) + echo $(LIBCOMMAND) libfltk-utf8_forms_s.a libfltk-utf8_forms_s.o $(RM) $@ - $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o - $(CHMOD) +x libfltk_forms_s.a + $(LIBCOMMAND) libfltk-utf8_forms_s.a libfltk-utf8_forms_s.o + $(CHMOD) +x libfltk-utf8_forms_s.a $(GLLIBNAME): $(GLOBJECTS) echo $(LIBCOMMAND) $@ ... @@ -271,35 +275,35 @@ $(LIBCOMMAND) $@ $(GLOBJECTS) $(RANLIB) $@ -libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1 +libfltk-utf8_gl.so.1.1: $(GLOBJECTS) libfltk-utf8.so.1.1 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk - $(RM) libfltk_gl.so - $(LN) libfltk_gl.so.1.1 libfltk_gl.so + $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk-utf8 + $(RM) libfltk-utf8_gl.so + $(LN) libfltk-utf8_gl.so.1.1 libfltk-utf8_gl.so -libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1 +libfltk-utf8_gl.sl.1.1: $(GLOBJECTS) libfltk-utf8.sl.1.1 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk - $(RM) libfltk_gl.sl - $(LN) libfltk_gl.sl.1.1 libfltk_gl.sl + $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk-utf8 + $(RM) libfltk-utf8_gl.sl + $(LN) libfltk-utf8_gl.sl.1.1 libfltk-utf8_gl.sl -libfltk_gl.1.1.dylib: $(GLOBJECTS) libfltk.1.1.dylib +libfltk-utf8_gl.1.1.dylib: $(GLOBJECTS) libfltk-utf8.1.1.dylib echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ \ -install_name $(libdir)/$@ \ -current_version 1.1.4 \ -compatibility_version 1.1.0 \ - $(GLOBJECTS) -L. $(GLDLIBS) -lfltk - $(RM) libfltk_gl.dylib - $(LN) libfltk_gl.1.1.dylib libfltk_gl.dylib - -libfltk_gl_s.a: $(GLOBJECTS) - echo $(DSOCOMMAND) libfltk_gl_s.o ... - $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) - echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o + $(GLOBJECTS) -L. $(GLDLIBS) -lfltk-utf8 + $(RM) libfltk-utf8_gl.dylib + $(LN) libfltk-utf8_gl.1.1.dylib libfltk-utf8_gl.dylib + +libfltk-utf8_gl_s.a: $(GLOBJECTS) + echo $(DSOCOMMAND) libfltk-utf8_gl_s.o ... + $(DSOCOMMAND) libfltk-utf8_gl_s.o $(GLOBJECTS) + echo $(LIBCOMMAND) libfltk-utf8_gl_s.a libfltk-utf8_gl_s.o $(RM) $@ - $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o - $(CHMOD) +x libfltk_gl_s.a + $(LIBCOMMAND) libfltk-utf8_gl_s.a libfltk-utf8_gl_s.o + $(CHMOD) +x libfltk-utf8_gl_s.a $(IMGLIBNAME): $(IMGOBJECTS) echo $(LIBCOMMAND) $@ ... @@ -307,45 +311,45 @@ $(LIBCOMMAND) $@ $(IMGOBJECTS) $(RANLIB) $@ -libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1 +libfltk-utf8_images.so.1.1: $(IMGOBJECTS) libfltk-utf8.so.1.1 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk - $(RM) libfltk_images.so - $(LN) libfltk_images.so.1.1 libfltk_images.so + $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk-utf8 + $(RM) libfltk-utf8_images.so + $(LN) libfltk-utf8_images.so.1.1 libfltk-utf8_images.so -libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1 +libfltk-utf8_images.sl.1.1: $(IMGOBJECTS) libfltk-utf8.sl.1.1 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk - $(RM) libfltk_images.sl - $(LN) libfltk_images.sl.1.1 libfltk_images.sl + $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk-utf8 + $(RM) libfltk-utf8_images.sl + $(LN) libfltk-utf8_images.sl.1.1 libfltk-utf8_images.sl -libfltk_images.1.1.dylib: $(IMGOBJECTS) libfltk.1.1.dylib +libfltk-utf8_images.1.1.dylib: $(IMGOBJECTS) libfltk-utf8.1.1.dylib echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ \ -install_name $(libdir)/$@ \ -current_version 1.1.4 \ -compatibility_version 1.1.0 \ - $(IMGOBJECTS) $(LDLIBS) -L. $(IMAGELIBS) -lfltk - $(RM) libfltk_images.dylib - $(LN) libfltk_images.1.1.dylib libfltk_images.dylib - -libfltk_images_s.a: $(IMGOBJECTS) - echo $(DSOCOMMAND) libfltk_images_s.o ... - $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) - echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o + $(IMGOBJECTS) $(LDLIBS) -L. $(IMAGELIBS) -lfltk-utf8 + $(RM) libfltk-utf8_images.dylib + $(LN) libfltk-utf8_images.1.1.dylib libfltk-utf8_images.dylib + +libfltk-utf8_images_s.a: $(IMGOBJECTS) + echo $(DSOCOMMAND) libfltk-utf8_images_s.o ... + $(DSOCOMMAND) libfltk-utf8_images_s.o $(IMGOBJECTS) + echo $(LIBCOMMAND) libfltk-utf8_images_s.a libfltk-utf8_images_s.o $(RM) $@ - $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o - $(CHMOD) +x libfltk_images_s.a + $(LIBCOMMAND) libfltk-utf8_images_s.a libfltk-utf8_images_s.o + $(CHMOD) +x libfltk-utf8_images_s.a clean : -@ $(RM) *.o $(DSONAME) $(FLDSONAME) $(GLDSONAME) $(IMGDSONAME) \ ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) ../lib/$(GLLIBNAME) \ ../lib/$(IMGLIBNAME) \ - libfltk.so libfltk_forms.so libfltk_gl.so libfltk_images.so \ - libfltk.sl libfltk_forms.sl libfltk_gl.sl libfltk_images.sl \ - libfltk.dylib libfltk_forms.dylib \ - libfltk_gl.dylib libfltk_images.dylib \ + libfltk-utf8.so libfltk-utf8_forms.so libfltk-utf8_gl.so libfltk-utf8_images.so \ + libfltk-utf8.sl libfltk-utf8_forms.sl libfltk-utf8_gl.sl libfltk-utf8_images.sl \ + libfltk-utf8.dylib libfltk-utf8_forms.dylib \ + libfltk-utf8_gl.dylib libfltk-utf8_images.dylib \ $(CLEAN) depend: $(CPPFILES) $(FLCPPFILES) $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) @@ -429,156 +433,156 @@ $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \ fi $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME) - if test x$(DSONAME) = xlibfltk.so.1.1; then\ - $(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) $(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) $(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) $(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) $(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) $(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) $(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) $(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) $(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) $(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) $(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) $(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) $(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) $(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) $(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) $(DESTDIR)$(libdir)/libfltk_images_s.a;\ - $(CP) libfltk_images_s.a $(DESTDIR)$(libdir); \ - $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.a; \ + if test x$(DSONAME) = xlibfltk-utf8.so.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8.so*;\ + $(CP) libfltk-utf8.so.1.1 $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8.so.1.1; \ + $(LN) libfltk-utf8.so.1.1 $(DESTDIR)$(libdir)/libfltk-utf8.so;\ + fi + if test x$(DSONAME) = xlibfltk-utf8.sl.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8.sl*;\ + $(CP) libfltk-utf8.sl.1.1 $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8.sl.1.1; \ + $(LN) libfltk-utf8.sl.1.1 $(DESTDIR)$(libdir)/libfltk-utf8.sl;\ + fi + if test x$(DSONAME) = xlibfltk-utf8.1.1.dylib; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8.*dylib;\ + $(CP) libfltk-utf8.1.1.dylib $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8.1.1.dylib; \ + $(LN) libfltk-utf8.1.1.dylib $(DESTDIR)$(libdir)/libfltk-utf8.dylib;\ + fi + if test x$(DSONAME) = xlibfltk-utf8_s.a; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_s.a;\ + $(CP) libfltk-utf8_s.a $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8_s.a; \ + fi + if test x$(FLDSONAME) = xlibfltk-utf8_forms.so.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_forms.so*;\ + $(CP) libfltk-utf8_forms.so.1.1 $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8_forms.so.1.1; \ + $(LN) libfltk-utf8_forms.so.1.1 $(DESTDIR)$(libdir)/libfltk-utf8_forms.so;\ + fi + if test x$(FLDSONAME) = xlibfltk-utf8_forms.sl.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_forms.sl*;\ + $(CP) libfltk-utf8_forms.sl.1.1 $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8_forms.sl.1.1; \ + $(LN) libfltk-utf8_forms.sl.1.1 $(DESTDIR)$(libdir)/libfltk-utf8_forms.sl;\ + fi + if test x$(FLDSONAME) = xlibfltk-utf8_forms.1.1.dylib; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_forms.*dylib;\ + $(CP) libfltk-utf8_forms.1.1.dylib $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8_forms.1.1.dylib; \ + $(LN) libfltk-utf8_forms.1.1.dylib $(DESTDIR)$(libdir)/libfltk-utf8_forms.dylib;\ + fi + if test x$(FLDSONAME) = xlibfltk-utf8_forms_s.a; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_forms_s.a;\ + $(CP) libfltk-utf8_forms_s.a $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8_forms.a; \ + fi + if test x$(GLDSONAME) = xlibfltk-utf8_gl.so.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_gl.so*;\ + $(CP) libfltk-utf8_gl.so.1.1 $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8_gl.so.1.1; \ + $(LN) libfltk-utf8_gl.so.1.1 $(DESTDIR)$(libdir)/libfltk-utf8_gl.so;\ + fi + if test x$(GLDSONAME) = xlibfltk-utf8_gl.sl.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_gl.sl*;\ + $(CP) libfltk-utf8_gl.sl.1.1 $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8_gl.sl.1.1; \ + $(LN) libfltk-utf8_gl.sl.1.1 $(DESTDIR)$(libdir)/libfltk-utf8_gl.sl;\ + fi + if test x$(GLDSONAME) = xlibfltk-utf8_gl.1.1.dylib; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_gl.*dylib;\ + $(CP) libfltk-utf8_gl.1.1.dylib $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8_gl.1.1.dylib; \ + $(LN) libfltk-utf8_gl.1.1.dylib $(DESTDIR)$(libdir)/libfltk-utf8_gl.dylib;\ + fi + if test x$(GLDSONAME) = xlibfltk-utf8_gl_s.a; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_gl_s.a;\ + $(CP) libfltk-utf8_gl_s.a $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8_gl.a; \ + fi + if test x$(IMGDSONAME) = xlibfltk-utf8_images.so.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_images.so*;\ + $(CP) libfltk-utf8_images.so.1.1 $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8_images.so.1.1; \ + $(LN) libfltk-utf8_images.so.1.1 $(DESTDIR)$(libdir)/libfltk-utf8_images.so;\ + fi + if test x$(IMGDSONAME) = xlibfltk-utf8_images.sl.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_images.sl*;\ + $(CP) libfltk-utf8_images.sl.1.1 $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8_images.sl.1.1; \ + $(LN) libfltk-utf8_images.sl.1.1 $(DESTDIR)$(libdir)/libfltk-utf8_images.sl;\ + fi + if test x$(IMGDSONAME) = xlibfltk-utf8_images.1.1.dylib; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_images.*dylib;\ + $(CP) libfltk-utf8_images.1.1.dylib $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8_images.1.1.dylib; \ + $(LN) libfltk-utf8_images.1.1.dylib $(DESTDIR)$(libdir)/libfltk-utf8_images.dylib;\ + fi + if test x$(IMGDSONAME) = xlibfltk-utf8_images_s.a; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_images_s.a;\ + $(CP) libfltk-utf8_images_s.a $(DESTDIR)$(libdir); \ + $(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk-utf8_images.a; \ fi uninstall: echo "Uninstalling libraries..." $(RM) $(DESTDIR)$(libdir)/$(LIBNAME) - if test x$(DSONAME) = xlibfltk.so.1.1; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ + if test x$(DSONAME) = xlibfltk-utf8.so.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8.so*;\ fi - if test x$(DSONAME) = xlibfltk.sl.1.1; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\ + if test x$(DSONAME) = xlibfltk-utf8.sl.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8.sl*;\ fi - if test x$(DSONAME) = xlibfltk.1.1.dylib; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\ + if test x$(DSONAME) = xlibfltk-utf8.1.1.dylib; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8.*dylib;\ fi - if test x$(DSONAME) = xlibfltk_s.a; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\ + if test x$(DSONAME) = xlibfltk-utf8_s.a; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_s.a;\ fi $(RM) $(DESTDIR)$(libdir)/$(FLLIBNAME); - if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\ + if test x$(FLDSONAME) = xlibfltk-utf8_forms.so.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_forms.so*;\ fi - if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\ + if test x$(FLDSONAME) = xlibfltk-utf8_forms.sl.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_forms.sl*;\ fi - if test x$(FLDSONAME) = xlibfltk_forms.1.1.dylib; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms.*dylib;\ + if test x$(FLDSONAME) = xlibfltk-utf8_forms.1.1.dylib; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_forms.*dylib;\ fi - if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_forms_s.a;\ + if test x$(FLDSONAME) = xlibfltk-utf8_forms_s.a; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_forms_s.a;\ fi if test x$(GLLIBNAME) != x; then\ $(RM) $(DESTDIR)$(libdir)/$(GLLIBNAME);\ fi - if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\ + if test x$(GLDSONAME) = xlibfltk-utf8_gl.so.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_gl.so*;\ fi - if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\ + if test x$(GLDSONAME) = xlibfltk-utf8_gl.sl.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_gl.sl*;\ fi - if test x$(GLDSONAME) = xlibfltk_gl.1.1.dylib; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\ + if test x$(GLDSONAME) = xlibfltk-utf8_gl.1.1.dylib; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_gl.*dylib;\ fi - if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\ + if test x$(GLDSONAME) = xlibfltk-utf8_gl_s.a; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_gl_s.a;\ fi if test x$(IMGLIBNAME) != x; then\ $(RM) $(DESTDIR)$(libdir)/$(IMGLIBNAME);\ fi - if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\ + if test x$(IMGDSONAME) = xlibfltk-utf8_images.so.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_images.so*;\ fi - if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\ + if test x$(IMGDSONAME) = xlibfltk-utf8_images.sl.1.1; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_images.sl*;\ fi - if test x$(IMGDSONAME) = xlibfltk_images.1.1.dylib; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\ + if test x$(IMGDSONAME) = xlibfltk-utf8_images.1.1.dylib; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_images.*dylib;\ fi - if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\ - $(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\ + if test x$(IMGDSONAME) = xlibfltk-utf8_images_s.a; then\ + $(RM) $(DESTDIR)$(libdir)/libfltk-utf8_images_s.a;\ fi Only in fltk-utf8-1.1.6/src: aimm.h diff -ur -- fltk-1.1.6/src/filename_absolute.cxx fltk-utf8-1.1.6/src/filename_absolute.cxx --- fltk-1.1.6/src/filename_absolute.cxx 2004-04-11 05:38:59.000000000 +0100 +++ fltk-utf8-1.1.6/src/filename_absolute.cxx 2005-06-12 19:06:26.000000000 +0100 @@ -30,6 +30,7 @@ */ #include +#include #include #include "flstring.h" #include @@ -63,7 +64,7 @@ char *temp = new char[tolen]; const char *start = from; - a = getcwd(temp, tolen); + a = fl_getcwd(temp, tolen); if (!a) { strlcpy(to, from, tolen); delete[] temp; @@ -126,7 +127,7 @@ return 0; } - if (!getcwd(cwd, sizeof(cwd))) { + if (!fl_getcwd(cwd, sizeof(cwd))) { strlcpy(to, from, tolen); return 0; } diff -ur -- fltk-1.1.6/src/filename_expand.cxx fltk-utf8-1.1.6/src/filename_expand.cxx --- fltk-1.1.6/src/filename_expand.cxx 2004-04-11 05:38:59.000000000 +0100 +++ fltk-utf8-1.1.6/src/filename_expand.cxx 2005-06-12 19:06:26.000000000 +0100 @@ -29,9 +29,11 @@ */ #include +#include #include #include "flstring.h" #if defined(WIN32) && !defined(__CYGWIN__) +#include #else # include # include @@ -58,7 +60,7 @@ switch (*a) { case '~': // a home directory name if (e <= a+1) { // current user's directory - value = getenv("HOME"); + value = fl_getenv("HOME"); #ifndef WIN32 } else { // another user's directory struct passwd *pwd; @@ -70,7 +72,7 @@ } break; case '$': /* an environment variable */ - {char t = *e; *(char *)e = 0; value = getenv(a+1); *(char *)e = t;} + {char t = *e; *(char *)e = 0; value = fl_getenv(a+1); *(char *)e = t;} break; } if (value) { diff -ur -- fltk-1.1.6/src/filename_isdir.cxx fltk-utf8-1.1.6/src/filename_isdir.cxx --- fltk-1.1.6/src/filename_isdir.cxx 2004-04-11 05:38:59.000000000 +0100 +++ fltk-utf8-1.1.6/src/filename_isdir.cxx 2005-06-12 19:06:26.000000000 +0100 @@ -30,6 +30,7 @@ #include #include #include +#include #if defined(WIN32) || defined(__EMX__) && !defined(__CYGWIN__) @@ -64,7 +65,7 @@ } #endif - return !stat(n, &s) && (s.st_mode&0170000)==0040000; + return !fl_stat(n, &s) && (s.st_mode&0170000)==0040000; } // diff -ur -- fltk-1.1.6/src/filename_list.cxx fltk-utf8-1.1.6/src/filename_list.cxx --- fltk-1.1.6/src/filename_list.cxx 2004-11-20 03:44:18.000000000 +0000 +++ fltk-utf8-1.1.6/src/filename_list.cxx 2005-06-12 19:06:26.000000000 +0100 @@ -27,7 +27,7 @@ #include #include "flstring.h" - +#include extern "C" { #ifndef HAVE_SCANDIR diff -ur -- fltk-1.1.6/src/fl_ask.cxx fltk-utf8-1.1.6/src/fl_ask.cxx --- fltk-1.1.6/src/fl_ask.cxx 2004-10-18 21:22:25.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_ask.cxx 2005-06-12 19:06:26.000000000 +0100 @@ -207,11 +207,11 @@ } // pointers you can use to change FLTK to a foreign language: -const char* fl_no = "No"; -const char* fl_yes= "Yes"; -const char* fl_ok = "OK"; -const char* fl_cancel= "Cancel"; -const char* fl_close= "Close"; +const char* Fl::txt_no = "No"; +const char* Fl::txt_yes= "Yes"; +const char* Fl::txt_ok = "OK"; +const char* Fl::txt_cancel= "Cancel"; +const char* Fl::txt_close= "Close"; // fltk functions: void fl_beep(int type) { @@ -267,7 +267,7 @@ va_start(ap, fmt); iconlabel = "i"; - innards(fmt, ap, 0, fl_ok, 0); + innards(fmt, ap, 0, Fl::txt_ok, 0); va_end(ap); iconlabel = "?"; } @@ -279,7 +279,7 @@ va_start(ap, fmt); iconlabel = "!"; - innards(fmt, ap, 0, fl_ok, 0); + innards(fmt, ap, 0, Fl::txt_ok, 0); va_end(ap); iconlabel = "?"; } @@ -290,7 +290,7 @@ fl_beep(FL_BEEP_QUESTION); va_start(ap, fmt); - int r = innards(fmt, ap, fl_no, fl_yes, 0); + int r = innards(fmt, ap, Fl::txt_no, Fl::txt_yes, 0); va_end(ap); return r; @@ -318,7 +318,7 @@ input->value(defstr); input->take_focus(); - int r = innards(fmt, ap, fl_cancel, fl_ok, 0); + int r = innards(fmt, ap, Fl::txt_cancel, Fl::txt_ok, 0); input->hide(); message->position(60,25); return r ? input->value() : 0; diff -ur -- fltk-1.1.6/src/fl_call_main.c fltk-utf8-1.1.6/src/fl_call_main.c --- fltk-1.1.6/src/fl_call_main.c 2004-04-11 05:38:59.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_call_main.c 2005-06-12 19:06:26.000000000 +0100 @@ -49,6 +49,7 @@ #include #include #include +#include #ifdef __MWERKS__ # include @@ -61,9 +62,21 @@ # define __argv _argv #endif +static int mbcs2utf(const char *s, int l, char *buf) +{ + static xchar *mbwbuf; + if (!s) return 0; + mbwbuf = (xchar*)malloc((l * 6 +6) * sizeof(xchar)); + l = mbstowcs(mbwbuf, s, l); + l = fl_unicode2utf(mbwbuf, l, buf); + free(mbwbuf); + return l; +} + int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { - int rc; + int rc, i; + char **ar; #ifdef _DEBUG /* @@ -82,8 +95,25 @@ freopen("conout$", "w", stderr); #endif /* _DEBUG */ + ar = (char**) malloc(sizeof(char*) * (__argc + 1)); + i = 0; + while (i < __argc) { + int l; + if (__wargv && fl_is_nt4()) { + for (l = 0; __wargv[i] && __wargv[i][l]; l++) {}; + ar[i] = (char*) malloc((l * 5) + 1); + ar[i][fl_unicode2utf(__wargv[i], l, ar[i])] = 0; + } else { + for (l = 0; __argv[i] && __argv[i][l]; l++) {}; + ar[i] = (char*) malloc((l * 5) + 1); + ar[i][mbcs2utf(__argv[i], l, ar[i])] = 0; + } + i++; + } + ar[__argc] = 0; + /* Run the standard main entry point function... */ - rc = main(__argc, __argv); + rc = main(__argc, ar); #ifdef _DEBUG fclose(stdin); diff -ur -- fltk-1.1.6/src/fl_color.cxx fltk-utf8-1.1.6/src/fl_color.cxx --- fltk-1.1.6/src/fl_color.cxx 2004-04-11 05:38:59.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_color.cxx 2005-06-12 19:06:26.000000000 +0100 @@ -58,7 +58,7 @@ fl_redmask = 0; return; # else - Fl::fatal("Requires true color visual"); + Fl::fatal(Fl::txt_requires_true_color); # endif } diff -ur -- fltk-1.1.6/src/fl_dnd_win32.cxx fltk-utf8-1.1.6/src/fl_dnd_win32.cxx --- fltk-1.1.6/src/fl_dnd_win32.cxx 2004-04-11 05:38:59.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_dnd_win32.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -26,13 +26,16 @@ // in. Search other files for "WIN32" or filenames ending in _win32.cxx // for other system-specific code. + #include #include #include +#include #include "flstring.h" #include #include #include +#include #include #if defined(__CYGWIN__) #include @@ -45,6 +48,8 @@ extern int fl_selection_length[2]; extern int fl_selection_buffer_length[2]; extern char fl_i_own_selection[2]; +extern char *fl_locale2utf8(const char *s, UINT codepage = 0); +extern unsigned int fl_codepage; Fl_Window *fl_dnd_target_window = 0; @@ -53,6 +58,8 @@ #include #include +#include + /** * subclass the IDropTarget to receive data from DnD operations @@ -164,40 +171,48 @@ fmt.tymed = TYMED_HGLOBAL; fmt.dwAspect = DVASPECT_CONTENT; fmt.lindex = -1; - fmt.cfFormat = CF_TEXT; - // if it is ASCII text, send an FL_PASTE with that text - if ( data->GetData( &fmt, &medium )==S_OK ) - { - void *stuff = GlobalLock( medium.hGlobal ); - //long len = GlobalSize( medium.hGlobal ); - Fl::e_length = strlen( (char*)stuff ); // min(strlen, len) - Fl::e_text = (char*)stuff; - Fl::belowmouse()->handle(FL_PASTE); // e_text will be invalid after this call - GlobalUnlock( medium.hGlobal ); - ReleaseStgMedium( &medium ); - SetForegroundWindow( hwnd ); - return S_OK; - } - fmt.tymed = TYMED_HGLOBAL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; fmt.cfFormat = CF_HDROP; // if it is a pathname list, send an FL_PASTE with a \n seperated list of filepaths if ( data->GetData( &fmt, &medium )==S_OK ) { HDROP hdrop = (HDROP)medium.hGlobal; - int i, n, nn = 0, nf = DragQueryFile( hdrop, (UINT)-1, 0, 0 ); - for ( i=0; ihandle(FL_PASTE); + Fl::belowmouse()->handle(FL_DROP); free( Fl::e_text ); ReleaseStgMedium( &medium ); SetForegroundWindow( hwnd ); @@ -245,6 +260,79 @@ } }; + +class FLEnum : public IEnumFORMATETC +{ +public: + int n; + LONG m_lRefCount; + + ULONG __stdcall AddRef(void) { + return InterlockedIncrement(&m_lRefCount); + } + + ULONG __stdcall Release(void) { + LONG count = InterlockedDecrement(&m_lRefCount); + if(count == 0) { + delete this; + return 0; + } else { + return count; + } + } + + + HRESULT __stdcall QueryInterface(REFIID iid, void **ppvObject) { + if(iid == IID_IEnumFORMATETC || iid == IID_IUnknown) { + AddRef(); + *ppvObject = this; + return S_OK; + } else { + *ppvObject = 0; + return E_NOINTERFACE; + } + } + + HRESULT __stdcall Next(ULONG celt, FORMATETC * rgelt, ULONG *pceltFetched) { + if (n > 0) return S_FALSE; + for (ULONG i = 0; i < celt; i++) { + n++; + rgelt->cfFormat = CF_HDROP; + rgelt->dwAspect = DVASPECT_CONTENT; + rgelt->lindex = -1; + rgelt->ptd = NULL; + rgelt->tymed = TYMED_HGLOBAL; + } + if (pceltFetched) *pceltFetched = celt; + return S_OK; + } + + HRESULT __stdcall Skip(ULONG celt) { + n += celt; + return (n == 0) ? S_OK : S_FALSE; + } + + HRESULT __stdcall Reset(void) { + n = 0; + return S_OK; + } + + HRESULT __stdcall Clone(IEnumFORMATETC **ppenum){ + *ppenum = new FLEnum(); + return S_OK; + } + + FLEnum(void) { + m_lRefCount = 1; + n = 0; + } + + ~FLEnum(void) { + n = 0; + } +}; + + /** * this is the actual object that FLTK can drop somewhere * - the implementation is minimal, but it should work with all decent Win32 drop targets @@ -252,8 +340,9 @@ class FLDataObject : public IDataObject { DWORD m_cRefCount; + FLEnum *m_EnumF; public: - FLDataObject() { m_cRefCount = 1; } + FLDataObject() { m_cRefCount = 1; m_EnumF = new FLEnum();} HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, LPVOID *ppvObject ) { if (IID_IUnknown==riid || IID_IDataObject==riid) { @@ -274,14 +363,48 @@ } // GetData currently allows ASCII text through Global Memory only HRESULT STDMETHODCALLTYPE GetData( FORMATETC *pformatetcIn, STGMEDIUM *pmedium ) { - if ((pformatetcIn->dwAspect & DVASPECT_CONTENT) && + if (/*(pformatetcIn->dwAspect & DVASPECT_CONTENT) &&*/ (pformatetcIn->tymed & TYMED_HGLOBAL) && - (pformatetcIn->cfFormat == CF_TEXT)) + (pformatetcIn->cfFormat == CF_HDROP)) { - HGLOBAL gh = GlobalAlloc( GHND, fl_selection_length[0]+1 ); - char *pMem = (char*)GlobalLock( gh ); - memmove( pMem, fl_selection_buffer[0], fl_selection_length[0] ); - pMem[ fl_selection_length[0] ] = 0; + HGLOBAL gh = GlobalAlloc( GHND| GMEM_SHARE, + (fl_selection_length[0]+4) * sizeof(short) + + sizeof(DROPFILES)); + unsigned char *pMem = (unsigned char*)GlobalLock( gh ); + if (!pMem) { + GlobalFree(gh); + return DV_E_FORMATETC; + } + DROPFILES *df =(DROPFILES*) pMem; + int l; + df->pFiles = sizeof(DROPFILES); + df->pt.x = 0; + df->pt.y = 0; + df->fNC = FALSE; + for (int i = 0; i < fl_selection_length[0]; i++) { + if (fl_selection_buffer[0][i] == '\n') { + fl_selection_buffer[0][i] = '\0'; + } + } + if (fl_is_nt4()) { + df->fWide = TRUE; + l = fl_utf2unicode((unsigned char*)fl_selection_buffer[0], + fl_selection_length[0], (xchar*)(((char*)pMem) + + sizeof(DROPFILES))); + } else { + df->fWide = FALSE; + WCHAR *wbuf = (WCHAR*)malloc(sizeof(WCHAR) * fl_selection_length[0] + 2); + l = fl_utf2unicode((unsigned char*)fl_selection_buffer[0], + fl_selection_length[0], wbuf); + l = WideCharToMultiByte(fl_codepage, 0, + wbuf, l, ((char*)pMem)+ sizeof(DROPFILES), + fl_selection_length[0], NULL, NULL); + free(wbuf); + } + pMem[l * sizeof(WCHAR) + sizeof(DROPFILES)] = 0; + pMem[l * sizeof(WCHAR) + 1 + sizeof(DROPFILES)] = 0; + pMem[l * sizeof(WCHAR) + 2 + sizeof(DROPFILES)] = 0; + pMem[l * sizeof(WCHAR) + 3 + sizeof(DROPFILES)] = 0; pmedium->tymed = TYMED_HGLOBAL; pmedium->hGlobal = gh; pmedium->pUnkForRelease = NULL; @@ -293,16 +416,21 @@ HRESULT STDMETHODCALLTYPE QueryGetData( FORMATETC *pformatetc ) { if ((pformatetc->dwAspect & DVASPECT_CONTENT) && - (pformatetc->tymed & TYMED_HGLOBAL) && - (pformatetc->cfFormat == CF_TEXT)) + (pformatetc->tymed & TYMED_ISTREAM ) && + (pformatetc->cfFormat == CF_HDROP)) return S_OK; return DV_E_FORMATETC; } + + HRESULT STDMETHODCALLTYPE EnumFormatEtc( DWORD dir, IEnumFORMATETC** ppenumFormatEtc) { + *ppenumFormatEtc = m_EnumF; + return S_OK; + } + // all the following methods are not really needed for a DnD object HRESULT STDMETHODCALLTYPE GetDataHere( FORMATETC* /*pformatetcIn*/, STGMEDIUM* /*pmedium*/) { return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE GetCanonicalFormatEtc( FORMATETC* /*in*/, FORMATETC* /*out*/) { return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE SetData( FORMATETC* /*pformatetc*/, STGMEDIUM* /*pmedium*/, BOOL /*fRelease*/) { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE EnumFormatEtc( DWORD /*dir*/, IEnumFORMATETC** /*ppenumFormatEtc*/) { return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE DAdvise( FORMATETC* /*pformatetc*/, DWORD /*advf*/, IAdviseSink* /*pAdvSink*/, DWORD* /*pdwConnection*/) { return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE DUnadvise( DWORD /*dwConnection*/) { return E_NOTIMPL; } diff -ur -- fltk-1.1.6/src/fl_draw.cxx fltk-utf8-1.1.6/src/fl_draw.cxx --- fltk-1.1.6/src/fl_draw.cxx 2004-10-18 21:40:36.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_draw.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -31,6 +31,8 @@ // Aligns them against the inside of the box. #define min(a,b) ((a)<(b)?(a):(b)) +#include +#include #include #include @@ -50,11 +52,11 @@ // Sets n to the number of characters put into the buffer. // Sets width to the width of the string in the current font. -static const char* -expand(const char* from, char* buf, double maxw, int& n, double &width, - int wrap, int draw_symbols) { +const char* +fl_expand_text(const char* from, char* buf, int maxbuf, double maxw, int& n, + double &width, int wrap, int draw_symbols) { char* o = buf; - char* e = buf+(MAXBUF-4); + char* e = buf+(maxbuf-4); underline_at = 0; char* word_end = o; const char* word_start = from; @@ -85,15 +87,14 @@ if (o > e) break; // don't overflow buffer if (c == '\t') { - for (c = (o-buf)%8; c<8 && o1) e = expand(p, buf, w - symtotal, buflen, width, - align&FL_ALIGN_WRAP, draw_symbols); + if (lines>1) e = fl_expand_text(p, buf, MAXBUF, w - symtotal, buflen, + width, align&FL_ALIGN_WRAP, draw_symbols); else e = ""; if (width > symoffset) symoffset = (int)(width + 0.5); @@ -211,7 +214,7 @@ if (underline_at && underline_at >= buf && underline_at < (buf + buflen)) callthis("_",1,xpos+int(fl_width(buf,underline_at-buf)),ypos-desc); - if (!*e || (*e == '@' && e[1] != '@')) break; + if (!*e || (*e == '@' && e[1] != '@' && draw_symbols)) break; p = e; } } @@ -281,6 +284,8 @@ char symbol[2][255], *symptr; int symwidth[2], symtotal; + if (draw_symbols == -1) draw_symbols = Fl::symbol_in_label(); + // count how many lines and put the last one into the buffer: symbol[0][0] = '\0'; symwidth[0] = 0; @@ -306,7 +311,8 @@ symtotal = symwidth[0] + symwidth[1]; for (p = str, lines=0; p;) { - e = expand(p, buf, w - symtotal, buflen, width, w != 0, draw_symbols); + e = fl_expand_text(p, buf, MAXBUF, w - symtotal, buflen, width, + w != 0, draw_symbols); if (int(width) > W) W = int(width); lines++; if (!*e || (*e == '@' && draw_symbols)) break; diff -ur -- fltk-1.1.6/src/fl_draw_image.cxx fltk-utf8-1.1.6/src/fl_draw_image.cxx --- fltk-1.1.6/src/fl_draw_image.cxx 2004-04-11 05:38:59.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_draw_image.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -33,6 +33,14 @@ // the "delta" and "linedelta", making them negative, though this may // defeat some of the shortcuts in translating the image for X. +#include + +const char* Fl::txt_cannot_do_scanline = "Can't do scanline_pad of %d"; +const char* Fl::txt_cannot_bits_per_pixel="Can't do %d bits_per_pixel colormap"; +const char* Fl::txt_cannot_24bit = "Can't do arbitrary 24bit color"; +const char* Fl::txt_cannot_do_bits_per_pixel = "Can't do %d bits_per_pixel"; + + #ifdef WIN32 # include "fl_draw_image_win32.cxx" #elif defined(__APPLE__) @@ -371,7 +379,7 @@ unsigned int n = pfv->scanline_pad/8; if (pfv->scanline_pad & 7 || (n&(n-1))) - Fl::fatal("Can't do scanline_pad of %d",pfv->scanline_pad); + Fl::fatal(Fl::txt_cannot_do_scanline,pfv->scanline_pad); if (n < sizeof(STORETYPE)) n = sizeof(STORETYPE); scanline_add = n-1; scanline_mask = -n; @@ -383,7 +391,7 @@ return; } if (!fl_visual->red_mask) - Fl::fatal("Can't do %d bits_per_pixel colormap",xi.bits_per_pixel); + Fl::fatal(Fl::txt_cannot_bits_per_pixel,xi.bits_per_pixel); # endif // otherwise it is a TrueColor visual: @@ -420,7 +428,7 @@ converter = bgr_converter; mono_converter = rrr_converter; } else { - Fl::fatal("Can't do arbitrary 24bit color"); + Fl::fatal(Fl::txt_cannot_24bit); } break; @@ -447,7 +455,7 @@ break; default: - Fl::fatal("Can't do %d bits_per_pixel",xi.bits_per_pixel); + Fl::fatal(Fl::txt_cannot_do_bits_per_pixel,xi.bits_per_pixel); } } @@ -458,6 +466,7 @@ int delta, int linedelta, int mono, Fl_Draw_Image_Cb cb, void* userdata) { + if (!userdata && !buf) return; if (!linedelta) linedelta = W*delta; int dx, dy, w, h; diff -ur -- fltk-1.1.6/src/fl_draw_image_mac.cxx fltk-utf8-1.1.6/src/fl_draw_image_mac.cxx --- fltk-1.1.6/src/fl_draw_image_mac.cxx 2004-09-10 01:07:52.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_draw_image_mac.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -52,6 +52,7 @@ int delta, int linedelta, int mono, Fl_Draw_Image_Cb cb, void* userdata) { + if (!userdata && !buf) return; if (!linedelta) linedelta = W*delta; #ifdef __APPLE_QD__ diff -ur -- fltk-1.1.6/src/fl_draw_image_win32.cxx fltk-utf8-1.1.6/src/fl_draw_image_win32.cxx --- fltk-1.1.6/src/fl_draw_image_win32.cxx 2004-04-11 05:38:59.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_draw_image_win32.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -117,6 +117,7 @@ char indexed = (fl_palette != 0); #endif + if (!userdata && !buf) return; if (!linedelta) linedelta = W*delta; int x, y, w, h; diff -ur -- fltk-1.1.6/src/fl_draw_pixmap.cxx fltk-utf8-1.1.6/src/fl_draw_pixmap.cxx --- fltk-1.1.6/src/fl_draw_pixmap.cxx 2004-09-11 20:32:43.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_draw_pixmap.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -46,6 +46,7 @@ } int fl_measure_pixmap(const char * const *data, int &w, int &h) { + if (!data || !data[0]) return 0; int i = sscanf(data[0],"%d%d%d%d",&w,&h,&ncolors,&chars_per_pixel); if (i<4 || w<=0 || h<=0 || chars_per_pixel!=1 && chars_per_pixel!=2) return w=0; @@ -333,6 +334,126 @@ return 1; } +int fl_rgba_pixmap(const char* const* di, Fl_Color bg, uchar* buf) +{ + pixmap_data d; + if (!fl_measure_pixmap(di, d.w, d.h)) return 0; + const uchar*const* data = (const uchar*const*)(di+1); + int transparent_index = -1; + + if (ncolors < 0) { // FLTK (non standard) compressed colormap + ncolors = -ncolors; + const uchar *p = *data++; + // if first color is ' ' it is transparent (put it later to make + // it not be transparent): + if (*p == ' ') { + uchar* c = (uchar*)&d.colors[(int)' ']; +#ifdef U64 + *(U64*)c = 0; +# if WORDS_BIGENDIAN + c += 4; +# endif +#endif + transparent_index = ' '; + Fl::get_color(bg, c[0], c[1], c[2]); c[3] = 0; + p += 4; + ncolors--; + } + // read all the rest of the colors: + for (int i=0; i < ncolors; i++) { + uchar* c = (uchar*)&d.colors[*p++]; +#ifdef U64 + *(U64*)c = 0; +# if WORDS_BIGENDIAN + c += 4; +# endif +#endif + *c++ = *p++; + *c++ = *p++; + *c++ = *p++; + *c = 0; + } + } else { // normal XPM colormap with names + if (chars_per_pixel>1) memset(d.byte1, 0, sizeof(d.byte1)); + for (int i=0; i1) { +#ifdef U64 + U64* colors = d.byte1[ind]; + if (!colors) colors = d.byte1[ind] = new U64[256]; +#else + U32* colors = d.byte1[ind]; + if (!colors) colors = d.byte1[ind] = new U32[256]; +#endif + c = (uchar*)&colors[*p]; + ind = (ind<<8)+*p++; + } else { + c = (uchar *)&d.colors[ind]; + } + // look for "c word", or last word if none: + const uchar *previous_word = p; + for (;;) { + while (*p && isspace(*p)) p++; + uchar what = *p++; + while (*p && !isspace(*p)) p++; + while (*p && isspace(*p)) p++; + if (!*p) {p = previous_word; break;} + if (what == 'c') break; + previous_word = p; + while (*p && !isspace(*p)) p++; + } +#ifdef U64 + *(U64*)c = 0; +# if WORDS_BIGENDIAN + c += 4; +# endif +#endif + if (!fl_parse_color((const char*)p, c[0], c[1], c[2])) { + // assume "None" or "#transparent" for any errors + // "bg" should be transparent... + Fl::get_color(bg, c[0], c[1], c[2]); + transparent_index = ind; + } + } + } + d.data = data; + + //let's go + if (1) { + int W = d.w; + for (int Y = 0; Y < d.h; Y++) { + uchar* new_ptr = buf + Y * 4 * d.w; + const uchar* p = data[Y]; + if (chars_per_pixel <= 1) { + for (int X = 0; X < W; X++) { + *(new_ptr++) = ((uchar*)&d.colors[*p])[0]; + *(new_ptr++) = ((uchar*)&d.colors[*p])[1]; + *(new_ptr++) = ((uchar*)&d.colors[*p])[2]; + if ((int)*p++ == transparent_index) *(new_ptr++) = 0; + else *(new_ptr++) = 255; + } + } else { + for (int X = 0; X < W; X++) { + int ind = *p; + U32 *color = d.byte1[*p++]; + ind = (ind<<8) | (*p); + *(new_ptr++) = ((uchar*)&color[*p])[0]; + *(new_ptr++) = ((uchar*)&color[*p])[1]; + *(new_ptr++) = ((uchar*)&color[*p])[2]; + if (ind == transparent_index) *(new_ptr++) = 0; + else *(new_ptr++) = 255; + p++; + } + } + } + } + return 1; +} + + // // End of "$Id: fl_draw_pixmap.cxx,v 1.4.2.8.2.16 2004/09/11 19:32:43 easysw Exp $". // diff -ur -- fltk-1.1.6/src/fl_file_dir.cxx fltk-utf8-1.1.6/src/fl_file_dir.cxx --- fltk-1.1.6/src/fl_file_dir.cxx 2004-07-23 22:12:24.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_file_dir.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -65,6 +65,7 @@ fc->label(message); if (!fname || !*fname) { + if (!fc->value()) fc->value("*"); if (fc->filter() != pat && (!pat || !fc->filter() || strcmp(pat, fc->filter())) && fc->value()) { // if pattern is different, remove name but leave old directory: diff -ur -- fltk-1.1.6/src/fl_font.cxx fltk-utf8-1.1.6/src/fl_font.cxx --- fltk-1.1.6/src/fl_font.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_font.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -53,6 +53,10 @@ fl_draw(str, strlen(str), x, y); } +void fl_draw(const char* str, int l, float x, float y) { + fl_draw(str, l, (int)x, (int)y); +} + // // End of "$Id: fl_font.cxx,v 1.9.2.5.2.8 2004/04/11 04:39:00 easysw Exp $". // diff -ur -- fltk-1.1.6/src/fl_font_win32.cxx fltk-utf8-1.1.6/src/fl_font_win32.cxx --- fltk-1.1.6/src/fl_font_win32.cxx 2004-09-11 19:06:29.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_font_win32.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -23,6 +23,7 @@ // Please report all bugs and problems to "fltk-bugs@fltk.org". // + Fl_FontSize::Fl_FontSize(const char* name, int size) { int weight = FW_NORMAL; int italic = 0; @@ -54,9 +55,12 @@ GetTextMetrics(fl_gc, &metr); // BOOL ret = GetCharWidthFloat(fl_gc, metr.tmFirstChar, metr.tmLastChar, font->width+metr.tmFirstChar); // ...would be the right call, but is not implemented into Window95! (WinNT?) - GetCharWidth(fl_gc, 0, 255, width); + //GetCharWidth(fl_gc, 0, 255, width); + int i; + for (i = 0; i < 64; i++) width[i] = NULL; #if HAVE_GL listbase = 0; + for (i = 0; i < 64; i++) glok[i] = 0; #endif minsize = maxsize = size; } @@ -77,6 +81,8 @@ #endif if (this == fl_fontsize) fl_fontsize = 0; DeleteObject(fid); + int i; + for (i = 0; i < 64; i++) free(width[i]); } //////////////////////////////////////////////////////////////// @@ -139,28 +145,91 @@ else return -1; } +// Unicode string buffer +static xchar *wstr = NULL; +static int wstr_len = 0; + + double fl_width(const char* c, int n) { - if (!fl_fontsize) return -1.0; + int i = 0; double w = 0.0; - while (n--) w += fl_fontsize->width[uchar(*c++)]; - return w; + while (i < n) { + unsigned int ucs; + int l = fl_utf2ucs((const unsigned char*)c + i, n - i, &ucs); + if (l < 1) l = 1; + i += l; + if (!fl_nonspacing(ucs)) { + w += fl_width(ucs); + } + } + return w; } -double fl_width(uchar c) { - if (fl_fontsize) return fl_fontsize->width[c]; - else return -1.0; +double fl_width(unsigned int c) { + unsigned int r; + r = (c & 0xFC00) >> 10; + if (!fl_fontsize->width[r]) { + SelectObject(fl_gc, fl_fontsize->fid); + fl_fontsize->width[r] = (int*) malloc(sizeof(int) * 0x0400); + SIZE s; + unsigned short i = 0, ii = r * 0x400; + for (; i < 0x400; i++) { + GetTextExtentPoint32W(fl_gc, (WCHAR*)&ii, 1, &s); + fl_fontsize->width[r][i] = s.cx; + ii++; + } + } + return (double) fl_fontsize->width[r][c & 0x03FF]; } void fl_draw(const char* str, int n, int x, int y) { + int i = 0; + int lx = 0; + COLORREF oldColor = SetTextColor(fl_gc, fl_RGB()); + SelectObject(fl_gc, fl_fontsize->fid); + while (i < n) { + unsigned int u; + unsigned int u1; + unsigned short ucs; + int l = fl_utf2ucs((const unsigned char*)str + i, n - i, &u); + if (u1 = fl_nonspacing(u)) { + x -= lx; + u = u1; + } else { + lx = (int) fl_width(u); + } + ucs = u; + if (l < 1) l = 1; + i += l; + TextOutW(fl_gc, x, y, (WCHAR*)&ucs, 1); + x += lx; + } + SetTextColor(fl_gc, oldColor); +} + +void fl_rtl_draw(const char* c, int n, int x, int y) { + int wn; + int i = 0; + int lx = 0; + if (n > wstr_len) { + wstr = (xchar*) realloc(wstr, sizeof(xchar) * n); + wstr_len = n; + } + wn = fl_utf2unicode((const unsigned char *)c, n, wstr); COLORREF oldColor = SetTextColor(fl_gc, fl_RGB()); SelectObject(fl_gc, fl_fontsize->fid); - TextOut(fl_gc, x, y, str, n); + while (i < wn) { + lx = (int) fl_width(wstr[i]); + x -= lx; + TextOutW(fl_gc, x, y, (WCHAR*)wstr + i, 1); + if (fl_nonspacing(wstr[i])) { + x += lx; + } + i++; + } SetTextColor(fl_gc, oldColor); } -void fl_draw(const char* str, int n, float x, float y) { - fl_draw(str, n, (int)x, (int)y); -} // // End of "$Id: fl_font_win32.cxx,v 1.9.2.3.2.9 2004/09/11 18:06:29 easysw Exp $". diff -ur -- fltk-1.1.6/src/fl_font_x.cxx fltk-utf8-1.1.6/src/fl_font_x.cxx --- fltk-1.1.6/src/fl_font_x.cxx 2004-09-11 19:06:29.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_font_x.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: fl_font_x.cxx,v 1.10.2.8 2004/09/11 18:06:29 easysw Exp $" +// "$Id: fl_font_x.cxx,v 1.10.2.4 2003/01/30 21:43:52 easysw Exp $" // // Standard X11 font selection code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -24,13 +24,14 @@ // Fl_FontSize::Fl_FontSize(const char* name) { - font = XLoadQueryFont(fl_display, name); + font = XCreateUtf8FontStruct(fl_display, name); if (!font) { - Fl::warning("bad font: %s", name); - font = XLoadQueryFont(fl_display, "fixed"); // if fixed fails we crash +// Fl::warning("bad font: %s", name); + font = XCreateUtf8FontStruct(fl_display, "fixed"); } # if HAVE_GL listbase = 0; + for (int u = 0; u < 64; u++) glok[u] = 0; # endif } @@ -49,7 +50,7 @@ // } # endif if (this == fl_fontsize) fl_fontsize = 0; - XFreeFont(fl_display, font); + XFreeUtf8FontStruct(fl_display, font); } //////////////////////////////////////////////////////////////// @@ -110,39 +111,29 @@ return (*c++ && !strcmp(c,fl_encoding)); } -// locate or create an Fl_FontSize for a given Fl_Fontdesc and size: -static Fl_FontSize* find(int fnum, int size) { - Fl_Fontdesc* s = fl_fonts+fnum; - if (!s->name) s = fl_fonts; // use font 0 if still undefined - Fl_FontSize* f; - for (f = s->first; f; f = f->next) - if (f->minsize <= size && f->maxsize >= size) return f; - fl_open_display(); - if (!s->xlist) { - s->xlist = XListFonts(fl_display, s->name, 100, &(s->n)); - if (!s->xlist) { // use fixed if no matching font... - s->first = new Fl_FontSize("fixed"); - s->first->minsize = 0; - s->first->maxsize = 32767; - return s->first; - } - } - // search for largest <= font size: - char* name = s->xlist[0]; int ptsize = 0; // best one found so far +static char *find_best_font(const char *fname, int size) { + int cnt; + static char **list = NULL; + + if (list) XFreeFontNames(list); + list = XListFonts(fl_display, fname, 100, &cnt); + if (!list) return "fixed"; + + // search for largest <= font size: + char* name = list[0]; int ptsize = 0; // best one found so far int matchedlength = 32767; - char namebuffer[1024]; // holds scalable font name + static char namebuffer[1024]; // holds scalable font name int found_encoding = 0; - int m = s->n; if (m<0) m = -m; + int m = cnt; if (m<0) m = -m; for (int n=0; n < m; n++) { - - char* thisname = s->xlist[n]; + char* thisname = list[n]; if (fl_correct_encoding(thisname)) { if (!found_encoding) ptsize = 0; // force it to choose this found_encoding = 1; } else { if (found_encoding) continue; } - char* c = fl_find_fontsize(thisname); + char* c = (char*)fl_find_fontsize(thisname); int thissize = c ? atoi(c) : MAXSIZE; int thislength = strlen(thisname); if (thissize == size && thislength < matchedlength) { @@ -159,41 +150,94 @@ strcpy(namebuffer+l,c); name = namebuffer; ptsize = size; - } else if (!ptsize || // no fonts yet - thissize < ptsize && ptsize > size || // current font too big - thissize > ptsize && thissize <= size // current too small + } else if (!ptsize || // no fonts yet + thissize < ptsize && ptsize > size || // current font too big + thissize > ptsize && thissize <= size // current too small ) { - name = thisname; ptsize = thissize; + // int l = c-thisname; + // memcpy(namebuffer,thisname,l); + //l += sprintf(namebuffer+l,"%d-*%s",size, fl_font_word(thisname, 13)); + name = thisname; + ptsize = thissize; matchedlength = thislength; } } + return name; +}; - if (ptsize != size) { // see if we already found this unscalable font: - for (f = s->first; f; f = f->next) { - if (f->minsize <= ptsize && f->maxsize >= ptsize) { - if (f->minsize > size) f->minsize = size; - if (f->maxsize < size) f->maxsize = size; - return f; - } - } - } +static char *put_font_size(const char *n, int size) +{ + int i = 0; + char *buf; + const char *ptr; + char *f; + char *name; + int nbf = 1; + name = strdup(n); + while (name[i]) { + if (name[i] == ',') {nbf++; name[i] = '\0';} + i++; + } + + buf = (char*) malloc(nbf * 256); + buf[0] = '\0'; + ptr = name; + i = 0; + while (ptr && nbf > 0) { + f = find_best_font(ptr, size); + while (*f) { + buf[i] = *f; + f++; i++; + } + nbf--; + while (*ptr) ptr++; + if (nbf) { + ptr++; + buf[i] = ','; + i++; + } + while(isspace(*ptr)) ptr++; + } + buf[i] = '\0'; + free(name); + return buf; +} + + +char *fl_get_font_xfld(int fnum, int size) { + Fl_Fontdesc* s = fl_fonts+fnum; + if (!s->name) s = fl_fonts; // use font 0 if still undefined + fl_open_display(); + return put_font_size(s->name, size); +} + +// locate or create an Fl_FontSize for a given Fl_Fontdesc and size: +static Fl_FontSize* find(int fnum, int size) { + char *name; + Fl_Fontdesc* s = fl_fonts+fnum; + if (!s->name) s = fl_fonts; // use font 0 if still undefined + Fl_FontSize* f; + for (f = s->first; f; f = f->next) + if (f->minsize <= size && f->maxsize >= size) return f; + fl_open_display(); - // okay, we definately have some name, make the font: + name = put_font_size(s->name, size); f = new Fl_FontSize(name); - if (ptsize < size) {f->minsize = ptsize; f->maxsize = size;} - else {f->minsize = size; f->maxsize = ptsize;} + f->minsize = size; + f->maxsize = size; f->next = s->first; s->first = f; + free(name); return f; - } + //////////////////////////////////////////////////////////////// // Public interface: int fl_font_ = 0; int fl_size_ = 0; -XFontStruct* fl_xfont = 0; +XUtf8FontStruct* fl_xfont; static GC font_gc; void fl_font(int fnum, int size) { @@ -208,55 +252,37 @@ } int fl_height() { - if (fl_xfont) return (fl_xfont->ascent + fl_xfont->descent); - else return -1; + return (fl_xfont->ascent + fl_xfont->descent); } int fl_descent() { - if (fl_xfont) return fl_xfont->descent; - else return -1; + return fl_xfont->descent; } double fl_width(const char* c, int n) { - if (!fl_xfont) return -1.0; - XCharStruct* p = fl_xfont->per_char; - if (!p) return n*fl_xfont->min_bounds.width; - int a = fl_xfont->min_char_or_byte2; - int b = fl_xfont->max_char_or_byte2 - a; - int w = 0; - while (n--) { - int x = *(uchar*)c++ - a; - if (x >= 0 && x <= b) w += p[x].width; - else w += fl_xfont->min_bounds.width; - } - return w; + return (double) XUtf8TextWidth(fl_xfont, c, n); } -double fl_width(uchar c) { - if (!fl_xfont) return -1; - XCharStruct* p = fl_xfont->per_char; - if (p) { - int a = fl_xfont->min_char_or_byte2; - int b = fl_xfont->max_char_or_byte2 - a; - int x = c-a; - if (x >= 0 && x <= b) return p[x].width; - } - return fl_xfont->min_bounds.width; +double fl_width(unsigned int c) { + return (double) XUtf8UcsWidth(fl_xfont, c); } -void fl_draw(const char* str, int n, int x, int y) { +void fl_draw(const char* c, int n, int x, int y) { if (font_gc != fl_gc) { - if (!fl_xfont) fl_font(FL_HELVETICA, 14); + if (!fl_xfont) fl_font(FL_HELVETICA, 12); font_gc = fl_gc; - XSetFont(fl_display, fl_gc, fl_xfont->fid); } - XDrawString(fl_display, fl_window, fl_gc, x, y, str, n); + XUtf8DrawString(fl_display, fl_window, fl_xfont, fl_gc, x, y, c, n); } - -void fl_draw(const char* str, int n, float x, float y) { - fl_draw(str, n, (int)x, (int)y); + +void fl_rtl_draw(const char* c, int n, int x, int y) { + if (font_gc != fl_gc) { + if (!fl_xfont) fl_font(FL_HELVETICA, 12); + font_gc = fl_gc; + } + XUtf8DrawRtlString(fl_display, fl_window, fl_xfont, fl_gc, x, y, c, n); } // -// End of "$Id: fl_font_x.cxx,v 1.10.2.8 2004/09/11 18:06:29 easysw Exp $". +// End of "$Id: fl_font_x.cxx,v 1.10.2.4 2003/01/30 21:43:52 easysw Exp $". // diff -ur -- fltk-1.1.6/src/fl_line_style.cxx fltk-utf8-1.1.6/src/fl_line_style.cxx --- fltk-1.1.6/src/fl_line_style.cxx 2004-08-31 23:00:48.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_line_style.cxx 2005-06-12 19:06:27.000000000 +0100 @@ -29,6 +29,8 @@ #include "flstring.h" #include +const char* Fl::txt_cannot_create_pen = "fl_line_style(): Could not create GDI pen object."; + #ifdef __APPLE_QUARTZ__ float fl_quartz_line_width_ = 1.0f; static enum CGLineCap fl_quartz_line_cap_ = kCGLineCapButt; @@ -62,7 +64,7 @@ LOGBRUSH penbrush = {BS_SOLID,fl_RGB(),0}; // can this be fl_brush()? HPEN newpen = ExtCreatePen(s1, width, &penbrush, n, n ? a : 0); if (!newpen) { - Fl::error("fl_line_style(): Could not create GDI pen object."); + Fl::error(Fl::txt_cannot_create_pen); return; } HPEN oldpen = (HPEN)SelectObject(fl_gc, newpen); diff -ur -- fltk-1.1.6/src/fl_set_fonts_win32.cxx fltk-utf8-1.1.6/src/fl_set_fonts_win32.cxx --- fltk-1.1.6/src/fl_set_fonts_win32.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_set_fonts_win32.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: fl_set_fonts_win32.cxx,v 1.5.2.5.2.11 2004/04/11 04:39:00 easysw Exp $" +// "$Id: fl_set_fonts_win32.cxx,v 1.5.2.5.2.10 2003/03/09 00:22:18 spitzak Exp $" // // WIN32 font utilities for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -27,6 +27,7 @@ // are found on the X server. It tries to place the fonts into families // and to sort them so the first 4 in a family are normal, bold, italic, // and bold italic. +#include // Bug: older versions calculated the value for *ap as a side effect of // making the name, and then forgot about it. To avoid having to change @@ -54,21 +55,46 @@ } if (ap) *ap = f->fontname[ENDOFBUFFER]; return f->fontname; + } static int fl_free_font = FL_FREE_FONT; -static int CALLBACK -enumcb(CONST LOGFONT *lpelf, +static int CALLBACK + enumcbw(CONST LOGFONTW *lpelf, + CONST TEXTMETRICW * /*lpntm*/, + DWORD /*FontType*/, + LPARAM p) { + if (!p && lpelf->lfCharSet != ANSI_CHARSET) return 1; + char *n; + int l = wcslen(lpelf->lfFaceName); + n = (char*) malloc(l * 6 + 1); + n[fl_unicode2utf((xchar*)lpelf->lfFaceName, l, n)] = 0; + for (int i=0; ilfWeight <= 400) + buffer[0] = 'B', Fl::set_font((Fl_Font)(fl_free_font++), strdup(buffer)); + buffer[0] = 'I'; Fl::set_font((Fl_Font)(fl_free_font++), strdup(buffer)); + if (lpelf->lfWeight <= 400) + buffer[0] = 'P', Fl::set_font((Fl_Font)(fl_free_font++), strdup(buffer)); + free(n); + return 1; +} + +static int CALLBACK + enumcb(CONST LOGFONT *lpelf, CONST TEXTMETRIC * /*lpntm*/, DWORD /*FontType*/, - LPARAM p) { + LPARAM p) { if (!p && lpelf->lfCharSet != ANSI_CHARSET) return 1; const char *n = lpelf->lfFaceName; for (int i=0; ilfWeight <= 400) buffer[0] = 'B', Fl::set_font((Fl_Font)(fl_free_font++), strdup(buffer)); @@ -76,12 +102,17 @@ if (lpelf->lfWeight <= 400) buffer[0] = 'P', Fl::set_font((Fl_Font)(fl_free_font++), strdup(buffer)); return 1; + } Fl_Font Fl::set_fonts(const char* xstarname) { if (fl_free_font == FL_FREE_FONT) {// if not already been called if (!fl_gc) fl_GetDC(0); - EnumFontFamilies(fl_gc, NULL, (FONTENUMPROC)enumcb, xstarname != 0); + if (fl_is_nt4()) { + EnumFontFamiliesW(fl_gc, NULL, (FONTENUMPROCW)enumcbw, xstarname != 0); + } else { + EnumFontFamiliesA(fl_gc, NULL, (FONTENUMPROCA)enumcb, xstarname != 0); + } } return (Fl_Font)fl_free_font; } @@ -90,12 +121,46 @@ static int nbSize; static int cyPerInch; static int sizes[128]; +static int CALLBACK + +EnumSizeCbW(CONST LOGFONTW * /*lpelf*/, + CONST TEXTMETRICW *lpntm, + DWORD fontType, + LPARAM /*p*/) { + if ((fontType & RASTER_FONTTYPE) == 0) { + sizes[0] = 0; + nbSize = 1; + + // Scalable font + return 0; + } + + int add = lpntm->tmHeight - lpntm->tmInternalLeading; + add = MulDiv(add, 72, cyPerInch); + + int start = 0; + while ((start < nbSize) && (sizes[start] < add)) { + start++; + } + + if ((start < nbSize) && (sizes[start] == add)) { + return 1; + } + + for (int i=nbSize; i>start; i--) sizes[i] = sizes[i - 1]; + + sizes[start] = add; + nbSize++; + + // Stop enum if buffer overflow + return nbSize < 128; +} static int CALLBACK EnumSizeCb(CONST LOGFONT * /*lpelf*/, CONST TEXTMETRIC *lpntm, - DWORD fontType, - LPARAM /*p*/) { + DWORD fontType, + LPARAM /*p*/) { if ((fontType & RASTER_FONTTYPE) == 0) { sizes[0] = 0; nbSize = 1; @@ -135,13 +200,21 @@ if (!fl_gc) fl_GetDC(0); cyPerInch = GetDeviceCaps(fl_gc, LOGPIXELSY); if (cyPerInch < 1) cyPerInch = 1; - EnumFontFamilies(fl_gc, s->name+1, (FONTENUMPROC)EnumSizeCb, 0); - + if (fl_is_nt4()) { + int l = fl_utf_nb_char((unsigned char*)s->name+1, strlen(s->name+1)); + unsigned short *b = (unsigned short*) malloc((l + 1) * sizeof(short)); + fl_utf2unicode((unsigned char*)s->name+1, l, (xchar*)b); + b[l] = 0; + EnumFontFamiliesW(fl_gc, (WCHAR*)b, (FONTENUMPROCW)EnumSizeCbW, 0); + free(b); + } else { + EnumFontFamiliesA(fl_gc, fl_utf82locale(s->name+1, strlen(s->name+1), 0), (FONTENUMPROCA)EnumSizeCb, 0); + } sizep = sizes; return nbSize; } // -// End of "$Id: fl_set_fonts_win32.cxx,v 1.5.2.5.2.11 2004/04/11 04:39:00 easysw Exp $". +// End of "$Id: fl_set_fonts_win32.cxx,v 1.5.2.5.2.10 2003/03/09 00:22:18 spitzak Exp $". // diff -ur -- fltk-1.1.6/src/fl_set_fonts_x.cxx fltk-utf8-1.1.6/src/fl_set_fonts_x.cxx --- fltk-1.1.6/src/fl_set_fonts_x.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_set_fonts_x.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: fl_set_fonts_x.cxx,v 1.1.2.8 2004/04/11 04:39:00 easysw Exp $" +// "$Id: fl_set_fonts_x.cxx,v 1.1.2.7 2003/03/09 00:22:20 spitzak Exp $" // // X11 font utilities for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -255,7 +255,7 @@ return size; } -static int fl_free_font = FL_FREE_FONT; +static unsigned int fl_free_font = FL_FREE_FONT; Fl_Font Fl::set_fonts(const char* xstarname) { if (fl_free_font > FL_FREE_FONT) // already been here @@ -287,13 +287,13 @@ } /*if (*p=='-' || i > first_xlist+1)*/ p = canon; } - int j; + unsigned int j; for (j = 0;; j++) { - if (j < FL_FREE_FONT) { + /*if (j < FL_FREE_FONT) { // see if it is one of our built-in fonts: // if so, set the list of x fonts, since we have it anyway if (fl_fonts[j].name && !strcmp(fl_fonts[j].name, p)) break; - } else { + } else */{ j = fl_free_font++; if (p == canon) p = strdup(p); else used_xlist = 1; Fl::set_font((Fl_Font)j, p); @@ -344,5 +344,5 @@ } // -// End of "$Id: fl_set_fonts_x.cxx,v 1.1.2.8 2004/04/11 04:39:00 easysw Exp $". +// End of "$Id: fl_set_fonts_x.cxx,v 1.1.2.7 2003/03/09 00:22:20 spitzak Exp $". // Only in fltk-utf8-1.1.6/src: fl_utf8.cxx diff -ur -- fltk-1.1.6/src/fl_vertex.cxx fltk-utf8-1.1.6/src/fl_vertex.cxx --- fltk-1.1.6/src/fl_vertex.cxx 2004-08-31 23:00:49.000000000 +0100 +++ fltk-utf8-1.1.6/src/fl_vertex.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -39,12 +39,19 @@ static matrix m = {1, 0, 0, 1, 0, 0}; -static matrix stack[10]; +static matrix *stack = NULL; static int sptr = 0; +static int smalloc = 0; -void fl_push_matrix() {stack[sptr++] = m;} +void fl_push_matrix() { + if (smalloc <= sptr) { + smalloc = smalloc ? (smalloc * 2) : 16; + stack = (matrix*) realloc(stack, sizeof(matrix) *smalloc); + } + stack[sptr++] = m; +} -void fl_pop_matrix() {m = stack[--sptr];} +void fl_pop_matrix() {if (sptr > 0) m = stack[--sptr];} void fl_mult_matrix(double a, double b, double c, double d, double x, double y) { matrix o; diff -ur -- fltk-1.1.6/src/gl_draw.cxx fltk-utf8-1.1.6/src/gl_draw.cxx --- fltk-1.1.6/src/gl_draw.cxx 2004-09-09 22:34:48.000000000 +0100 +++ fltk-utf8-1.1.6/src/gl_draw.cxx 2005-06-12 19:06:28.000000000 +0100 @@ -35,6 +35,11 @@ #include #include "Fl_Gl_Choice.H" #include "Fl_Font.H" +#include + +#if !defined(WIN32) && !defined(__APPLE__) +#include +#endif #if USE_XFT extern XFontStruct* fl_xxfont(); @@ -46,22 +51,30 @@ double gl_width(const char* s, int n) {return fl_width(s,n);} double gl_width(uchar c) {return fl_width(c);} +static Fl_FontSize *gl_fontsize; + + void gl_font(int fontid, int size) { fl_font(fontid, size); if (!fl_fontsize->listbase) { + fl_fontsize->listbase = glGenLists(0x10000); + } + gl_fontsize = fl_fontsize; + glListBase(fl_fontsize->listbase); +} + +static void get_list(int r) { + unsigned int ii = r * 0x400; + gl_fontsize->glok[r] = 1; #ifdef WIN32 - int base = fl_fontsize->metr.tmFirstChar; - int count = fl_fontsize->metr.tmLastChar-base+1; - HFONT oldFid = (HFONT)SelectObject(fl_gc, fl_fontsize->fid); - fl_fontsize->listbase = glGenLists(256); - wglUseFontBitmaps(fl_gc, base, count, fl_fontsize->listbase+base); - SelectObject(fl_gc, oldFid); + HFONT oldFid = (HFONT)SelectObject(fl_gc, gl_fontsize->fid); + wglUseFontBitmapsW(fl_gc, ii, ii + 0x03ff, gl_fontsize->listbase+ii); + SelectObject(fl_gc, oldFid); #elif defined(__APPLE_QD__) - // undefined characters automatically receive an empty GL list in aglUseFont - fl_fontsize->listbase = glGenLists(256); - aglUseFont(aglGetCurrentContext(), fl_fontsize->font, fl_fontsize->face, - fl_fontsize->size, 0, 256, fl_fontsize->listbase); + aglUseFont(aglGetCurrentContext(), gl_fontsize->font, gl_fontsize->face, + gl_fontsize->size, ii, 0x03ff fl_fontsize->listbase+ii); #elif defined(__APPLE_QUARTZ__) +// FIXME short font, face, size; uchar fn[256]; fn[0]=strlen(fl_fontsize->q_name); @@ -73,16 +86,14 @@ aglUseFont(aglGetCurrentContext(), font, face, size, 0, 256, fl_fontsize->listbase); #else -# if USE_XFT - fl_xfont = fl_xxfont(); -# endif // USE_XFT - int base = fl_xfont->min_char_or_byte2; - int count = fl_xfont->max_char_or_byte2-base+1; - fl_fontsize->listbase = glGenLists(256); - glXUseXFont(fl_xfont->fid, base, count, fl_fontsize->listbase+base); + for (int i = 0; i < 0x400; i++) { + XFontStruct *font = NULL; + unsigned short id; + XGetUtf8FontAndGlyph(gl_fontsize->font, ii, &font, &id); + if (font) glXUseXFont(font->fid, id, 1, gl_fontsize->listbase+ii); + ii++; + } #endif - } - glListBase(fl_fontsize->listbase); } @@ -134,7 +145,20 @@ const char *txt = fl_iso2macRoman(str, n); glCallLists(n, GL_UNSIGNED_BYTE, txt); #else - glCallLists(n, GL_UNSIGNED_BYTE, str); + static xchar *buf = NULL; + static int l = 0; + if (n > l) { + buf = (xchar*) realloc(buf, sizeof(xchar) * (n + 20)); + l = n + 20; + } + n = fl_utf2unicode((const unsigned char*)str, n, buf); + int i; + for (i = 0; i < n; i++) { + unsigned int r; + r = (str[i] & 0xFC00) >> 10; + if (!gl_fontsize->glok[r]) get_list(r); + } + glCallLists(n, GL_UNSIGNED_SHORT, buf); #endif } diff -ur -- fltk-1.1.6/src/makedepend fltk-utf8-1.1.6/src/makedepend --- fltk-1.1.6/src/makedepend 2003-07-23 15:39:29.000000000 +0100 +++ fltk-utf8-1.1.6/src/makedepend 2005-06-12 19:06:28.000000000 +0100 @@ -1,80 +1,96 @@ # DO NOT DELETE -Fl.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H +Fl.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H Fl.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/x.H ../FL/Fl_Window.H Fl.o: ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H flstring.h ../FL/Fl_Export.H Fl.o: ../config.h ../FL/fl_draw.H -Fl_Adjuster.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Adjuster.o: ../FL/Fl_Adjuster.H ../FL/Fl_Valuator.H ../FL/Fl_Widget.H -Fl_Adjuster.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/fl_draw.H fastarrow.h -Fl_Adjuster.o: mediumarrow.h slowarrow.h -Fl_Bitmap.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H +Fl_Adjuster.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Adjuster.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Adjuster.H +Fl_Adjuster.o: ../FL/Fl_Valuator.H ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H +Fl_Adjuster.o: ../FL/Fl_Image.H ../FL/fl_draw.H fastarrow.h mediumarrow.h +Fl_Adjuster.o: slowarrow.h +Fl_Bitmap.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Bitmap.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H Fl_Bitmap.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/Fl_Widget.H Fl_Bitmap.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H Fl_Bitmap.o: ../FL/Fl_Bitmap.H flstring.h ../FL/Fl_Export.H ../config.h -Fl_Browser.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Browser.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Group.H -Fl_Browser.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -Fl_Browser.o: ../FL/Fl_Valuator.H ../FL/fl_draw.H flstring.h -Fl_Browser.o: ../FL/Fl_Export.H ../config.h -Fl_Browser_.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Browser_.o: ../FL/Fl_Widget.H ../FL/Fl_Browser_.H ../FL/Fl_Group.H -Fl_Browser_.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -Fl_Browser_.o: ../FL/Fl_Valuator.H ../FL/fl_draw.H -Fl_Browser_load.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Browser_load.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Group.H -Fl_Browser_load.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -Fl_Browser_load.o: ../FL/Fl_Valuator.H +Fl_Browser.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Browser.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Browser.H +Fl_Browser.o: ../FL/Fl_Browser_.H ../FL/Fl_Group.H ../FL/Fl_Widget.H +Fl_Browser.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H +Fl_Browser.o: ../FL/fl_draw.H flstring.h ../FL/Fl_Export.H ../config.h +Fl_Browser_.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Browser_.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Widget.H +Fl_Browser_.o: ../FL/Fl_Browser_.H ../FL/Fl_Group.H ../FL/Fl_Widget.H +Fl_Browser_.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H +Fl_Browser_.o: ../FL/fl_draw.H +Fl_Browser_load.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Browser_load.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Browser.H +Fl_Browser_load.o: ../FL/Fl_Browser_.H ../FL/Fl_Group.H ../FL/Fl_Widget.H +Fl_Browser_load.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H +Fl_Browser_load.o: ../FL/fl_utf8.H Fl_Box.o: ../FL/Fl_Widget.H ../FL/Fl_Box.H ../FL/Fl_Widget.H Fl_Box.o: ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Button.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Button.o: ../FL/Fl_Button.H ../FL/Fl_Widget.H ../FL/Fl_Group.H -Fl_Button.o: ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_Chart.o: ../FL/math.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Chart.o: ../FL/Fl_Chart.H ../FL/Fl_Widget.H ../FL/fl_draw.H flstring.h -Fl_Chart.o: ../FL/Fl_Export.H ../config.h +Fl_Button.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Button.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Button.H +Fl_Button.o: ../FL/Fl_Widget.H ../FL/Fl_Group.H ../FL/Fl_Window.H +Fl_Button.o: ../FL/Fl_Group.H +Fl_Chart.o: ../FL/math.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/Xutf8.h +Fl_Chart.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Chart.H +Fl_Chart.o: ../FL/Fl_Widget.H ../FL/fl_draw.H flstring.h ../FL/Fl_Export.H +Fl_Chart.o: ../config.h Fl_Check_Browser.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/fl_draw.H Fl_Check_Browser.o: ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Check_Browser.o: ../FL/Fl_Check_Browser.H ../FL/Fl.H ../FL/Fl_Browser_.H +Fl_Check_Browser.o: ../FL/Fl_Check_Browser.H ../FL/Fl.H ../FL/fl_utf8.H +Fl_Check_Browser.o: ../FL/math.h ../FL/Xutf8.h ../FL/Fl_Browser_.H Fl_Check_Browser.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H Fl_Check_Browser.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_Check_Button.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Check_Button.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Check_Button.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Check_Button.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H Fl_Check_Button.o: ../FL/Fl_Button.H ../FL/Fl_Widget.H -Fl_Choice.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Choice.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../FL/Fl_Widget.H -Fl_Choice.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H ../FL/fl_draw.H -Fl_Clock.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Clock.o: ../FL/Fl_Clock.H ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Color_Chooser.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Choice.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Choice.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Choice.H +Fl_Choice.o: ../FL/Fl_Menu_.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H +Fl_Choice.o: ../FL/Fl_Image.H ../FL/fl_draw.H +Fl_Clock.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Clock.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Clock.H +Fl_Clock.o: ../FL/Fl_Widget.H ../FL/fl_draw.H +Fl_Color_Chooser.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Color_Chooser.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Color_Chooser.o: ../FL/Fl_Color_Chooser.H ../FL/Fl_Group.H ../FL/Fl_Box.H Fl_Color_Chooser.o: ../FL/Fl_Widget.H ../FL/Fl_Return_Button.H Fl_Color_Chooser.o: ../FL/Fl_Button.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H Fl_Color_Chooser.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H Fl_Color_Chooser.o: ../FL/Fl_Value_Input.H ../FL/Fl_Valuator.H Fl_Color_Chooser.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/fl_draw.H -Fl_Color_Chooser.o: ../FL/math.h ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_Counter.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Counter.o: ../FL/Fl_Counter.H ../FL/Fl_Valuator.H ../FL/Fl_Widget.H -Fl_Counter.o: ../FL/fl_draw.H -Fl_Dial.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Dial.H -Fl_Dial.o: ../FL/Fl_Valuator.H ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/math.h -Fl_Double_Window.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H -Fl_Double_Window.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H -Fl_Double_Window.o: ../FL/Fl_Window.H ../FL/x.H ../FL/fl_draw.H +Fl_Color_Chooser.o: ../FL/Fl_Window.H ../FL/Fl_Group.H +Fl_Counter.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Counter.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Counter.H +Fl_Counter.o: ../FL/Fl_Valuator.H ../FL/Fl_Widget.H ../FL/fl_draw.H +Fl_Dial.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Dial.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Dial.H +Fl_Dial.o: ../FL/Fl_Valuator.H ../FL/Fl_Widget.H ../FL/fl_draw.H +Fl_Double_Window.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +Fl_Double_Window.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Double_Window.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/x.H +Fl_Double_Window.o: ../FL/fl_draw.H Fl_File_Browser.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H Fl_File_Browser.o: ../FL/Fl_Browser_.H ../FL/Fl_Group.H ../FL/Fl_Widget.H Fl_File_Browser.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_File_Browser.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_File_Browser.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/filename.H -Fl_File_Browser.o: ../FL/fl_draw.H ../FL/filename.H flstring.h -Fl_File_Browser.o: ../FL/Fl_Export.H ../config.h -Fl_File_Chooser.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Enumerations.H -Fl_File_Chooser.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_File_Chooser.o: ../FL/Fl_Widget.H ../FL/Fl_Group.H ../FL/Fl_Choice.H -Fl_File_Chooser.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H -Fl_File_Chooser.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Button.H -Fl_File_Chooser.o: ../FL/Fl_Preferences.H ../FL/Fl_Tile.H +Fl_File_Browser.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/fl_utf8.H +Fl_File_Browser.o: ../FL/math.h ../FL/Xutf8.h ../FL/filename.H +Fl_File_Browser.o: ../FL/fl_draw.H ../FL/fl_utf8.H ../FL/filename.H +Fl_File_Browser.o: flstring.h ../FL/Fl_Export.H ../config.h +Fl_File_Chooser.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/fl_utf8.H +Fl_File_Chooser.o: ../FL/math.h ../FL/Xutf8.h ../FL/Enumerations.H +Fl_File_Chooser.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H +Fl_File_Chooser.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Choice.H +Fl_File_Chooser.o: ../FL/Fl_Menu_.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H +Fl_File_Chooser.o: ../FL/Fl_Image.H ../FL/Fl_Menu_Button.H ../FL/Fl_Button.H +Fl_File_Chooser.o: ../FL/Fl_Preferences.H ../FL/Fl_Tile.H ../FL/Fl_Group.H Fl_File_Chooser.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H Fl_File_Chooser.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H Fl_File_Chooser.o: ../FL/Fl_Valuator.H ../FL/Fl_File_Icon.H ../FL/Fl.H @@ -82,12 +98,13 @@ Fl_File_Chooser.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H Fl_File_Chooser.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H ../FL/Fl_Input_.H Fl_File_Chooser.o: ../FL/Fl_Return_Button.H ../FL/fl_ask.H ../FL/Fl_Bitmap.H -Fl_File_Chooser2.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Enumerations.H -Fl_File_Chooser2.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_File_Chooser2.o: ../FL/Fl_Widget.H ../FL/Fl_Group.H ../FL/Fl_Choice.H -Fl_File_Chooser2.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H -Fl_File_Chooser2.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Button.H -Fl_File_Chooser2.o: ../FL/Fl_Preferences.H ../FL/Fl_Tile.H +Fl_File_Chooser2.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/fl_utf8.H +Fl_File_Chooser2.o: ../FL/math.h ../FL/Xutf8.h ../FL/Enumerations.H +Fl_File_Chooser2.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H +Fl_File_Chooser2.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Choice.H +Fl_File_Chooser2.o: ../FL/Fl_Menu_.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H +Fl_File_Chooser2.o: ../FL/Fl_Image.H ../FL/Fl_Menu_Button.H ../FL/Fl_Button.H +Fl_File_Chooser2.o: ../FL/Fl_Preferences.H ../FL/Fl_Tile.H ../FL/Fl_Group.H Fl_File_Chooser2.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H Fl_File_Chooser2.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H Fl_File_Chooser2.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H @@ -96,334 +113,425 @@ Fl_File_Chooser2.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H Fl_File_Chooser2.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H ../FL/Fl_Input_.H Fl_File_Chooser2.o: ../FL/Fl_Return_Button.H ../FL/fl_ask.H ../FL/filename.H -Fl_File_Chooser2.o: ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_Shared_Image.H +Fl_File_Chooser2.o: ../FL/x.H ../FL/Fl_Shared_Image.H ../FL/fl_utf8.H Fl_File_Chooser2.o: flstring.h ../FL/Fl_Export.H ../config.h -Fl_File_Icon.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl_File_Icon.H -Fl_File_Icon.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_File_Icon.o: ../FL/fl_utf8.H flstring.h ../FL/Fl_Export.H ../config.h +Fl_File_Icon.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +Fl_File_Icon.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H Fl_File_Icon.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/filename.H -Fl_File_Input.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_File_Input.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H ../FL/Fl_Input_.H -Fl_File_Input.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -Fl_File_Input.o: ../FL/fl_draw.H flstring.h ../FL/Fl_Export.H ../config.h -Fl_Group.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Group.o: ../FL/Fl_Group.H ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_Group.o: ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Help_View.o: ../FL/Fl_Help_View.H ../FL/Fl.H ../FL/Enumerations.H -Fl_Help_View.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -Fl_Help_View.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_Help_View.o: ../FL/fl_draw.H ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H -Fl_Help_View.o: ../FL/Fl_Pixmap.H flstring.h ../FL/Fl_Export.H ../config.h -Fl_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H -Fl_Image.o: ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_Widget.H -Fl_Image.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H -Fl_Image.o: ../FL/Fl_Image.H flstring.h ../FL/Fl_Export.H ../config.h -Fl_Input.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Input.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/fl_draw.H ../FL/fl_ask.H -Fl_Input.o: flstring.h ../FL/Fl_Export.H ../config.h -Fl_Input_.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Input_.o: ../FL/Fl_Input_.H ../FL/Fl_Widget.H ../FL/Fl_Window.H -Fl_Input_.o: ../FL/Fl_Group.H ../FL/fl_draw.H ../FL/fl_ask.H flstring.h +Fl_File_Input.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_File_Input.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_File_Input.H +Fl_File_Input.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Window.H +Fl_File_Input.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/fl_draw.H +Fl_File_Input.o: flstring.h ../FL/Fl_Export.H ../config.h +Fl_Group.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Group.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Group.H +Fl_Group.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H +Fl_Group.o: ../FL/fl_draw.H +Fl_Help_View.o: ../FL/Fl_Help_View.H ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +Fl_Help_View.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Help_View.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H +Fl_Help_View.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H +Fl_Help_View.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H +Fl_Help_View.o: ../FL/fl_utf8.H flstring.h ../FL/Fl_Export.H ../config.h +Fl_Image.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Image.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H ../FL/x.H +Fl_Image.o: ../FL/Fl_Window.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H +Fl_Image.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H ../FL/Fl_Image.H flstring.h +Fl_Image.o: ../FL/Fl_Export.H ../config.h +Fl_Input.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Input.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Input.H +Fl_Input.o: ../FL/Fl_Input_.H ../FL/fl_draw.H ../FL/fl_ask.H flstring.h +Fl_Input.o: ../FL/Fl_Export.H ../config.h +Fl_Input_.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Input_.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Input_.H +Fl_Input_.o: ../FL/Fl_Widget.H ../FL/Fl_Window.H ../FL/Fl_Group.H +Fl_Input_.o: ../FL/fl_draw.H ../FL/fl_ask.H ../FL/fl_utf8.H flstring.h Fl_Input_.o: ../FL/Fl_Export.H ../config.h -Fl_Light_Button.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Light_Button.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Light_Button.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Light_Button.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H Fl_Light_Button.o: ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Menu.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Menu.o: ../FL/Fl_Menu_Window.H ../FL/Fl_Single_Window.H ../FL/Fl_Window.H -Fl_Menu.o: ../FL/Fl_Menu_.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H -Fl_Menu.o: ../FL/Fl_Image.H ../FL/fl_draw.H -Fl_Menu_.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Menu_.o: ../FL/Fl_Menu_.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H -Fl_Menu_.o: ../FL/Fl_Image.H flstring.h ../FL/Fl_Export.H ../config.h -Fl_Menu_Bar.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Menu_Bar.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H ../FL/Fl_Widget.H -Fl_Menu_Bar.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H ../FL/fl_draw.H -Fl_Menu_Button.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Menu.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Menu.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Menu_Window.H +Fl_Menu.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H ../FL/Fl_Menu_.H +Fl_Menu.o: ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H +Fl_Menu.o: ../FL/fl_draw.H +Fl_Menu_.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Menu_.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Menu_.H +Fl_Menu_.o: ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H +Fl_Menu_.o: flstring.h ../FL/Fl_Export.H ../config.h +Fl_Menu_Bar.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Menu_Bar.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Menu_Bar.H +Fl_Menu_Bar.o: ../FL/Fl_Menu_.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H +Fl_Menu_Bar.o: ../FL/Fl_Image.H ../FL/fl_draw.H +Fl_Menu_Button.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Menu_Button.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Menu_Button.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Widget.H Fl_Menu_Button.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H ../FL/fl_draw.H -Fl_Menu_Window.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H -Fl_Menu_Window.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H -Fl_Menu_Window.o: ../FL/fl_draw.H ../FL/Fl_Menu_Window.H -Fl_Menu_Window.o: ../FL/Fl_Single_Window.H +Fl_Menu_Window.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +Fl_Menu_Window.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Menu_Window.o: ../FL/x.H ../FL/Fl_Window.H ../FL/fl_draw.H +Fl_Menu_Window.o: ../FL/Fl_Menu_Window.H ../FL/Fl_Single_Window.H Fl_Menu_add.o: ../FL/Fl_Menu_.H ../FL/Fl_Widget.H ../FL/Enumerations.H Fl_Menu_add.o: ../FL/Fl_Export.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H Fl_Menu_add.o: flstring.h ../FL/Fl_Export.H ../config.h -Fl_Menu_global.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Menu_global.o: ../FL/Fl_Menu_.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H -Fl_Menu_global.o: ../FL/Fl_Image.H -Fl_Multi_Label.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Multi_Label.o: ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H -Fl_Multi_Label.o: ../FL/Fl_Image.H ../FL/Fl_Multi_Label.H -Fl_Overlay_Window.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H -Fl_Overlay_Window.o: ../FL/Fl_Export.H ../FL/Fl_Overlay_Window.H -Fl_Overlay_Window.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H -Fl_Overlay_Window.o: ../FL/fl_draw.H ../FL/x.H -Fl_Pack.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Pack.H +Fl_Menu_global.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Menu_global.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Menu_.H +Fl_Menu_global.o: ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H +Fl_Multi_Label.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Multi_Label.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Widget.H +Fl_Multi_Label.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H +Fl_Multi_Label.o: ../FL/Fl_Multi_Label.H +Fl_Overlay_Window.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +Fl_Overlay_Window.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Overlay_Window.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H +Fl_Overlay_Window.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/x.H +Fl_Pack.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Pack.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Pack.H Fl_Pack.o: ../FL/Fl_Group.H ../FL/fl_draw.H -Fl_Pixmap.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Pixmap.o: ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_Widget.H -Fl_Pixmap.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H -Fl_Pixmap.o: ../FL/Fl_Pixmap.H flstring.h ../FL/Fl_Export.H ../config.h -Fl_Positioner.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Positioner.o: ../FL/Fl_Positioner.H ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Preferences.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Preferences.o: ../FL/Fl_Preferences.H ../FL/filename.H flstring.h -Fl_Preferences.o: ../FL/Fl_Export.H ../config.h -Fl_Progress.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Progress.o: ../FL/Fl_Progress.H ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Repeat_Button.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Pixmap.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Pixmap.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H ../FL/x.H +Fl_Pixmap.o: ../FL/Fl_Window.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H +Fl_Pixmap.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H flstring.h +Fl_Pixmap.o: ../FL/Fl_Export.H ../config.h +Fl_Positioner.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Positioner.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Positioner.H +Fl_Positioner.o: ../FL/Fl_Widget.H ../FL/fl_draw.H +Fl_Preferences.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Preferences.o: ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Preferences.o: ../FL/Fl_Preferences.H ../FL/filename.H ../FL/fl_utf8.H +Fl_Preferences.o: flstring.h ../FL/Fl_Export.H ../config.h +Fl_Progress.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Progress.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Progress.H +Fl_Progress.o: ../FL/Fl_Widget.H ../FL/fl_draw.H +Fl_Repeat_Button.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Repeat_Button.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Repeat_Button.o: ../FL/Fl_Repeat_Button.H ../FL/Fl.H ../FL/Fl_Button.H Fl_Repeat_Button.o: ../FL/Fl_Widget.H -Fl_Return_Button.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Return_Button.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Return_Button.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Return_Button.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H Fl_Return_Button.o: ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Roller.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Roller.o: ../FL/Fl_Roller.H ../FL/Fl_Valuator.H ../FL/Fl_Widget.H -Fl_Roller.o: ../FL/fl_draw.H -Fl_Round_Button.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Roller.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Roller.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Roller.H +Fl_Roller.o: ../FL/Fl_Valuator.H ../FL/Fl_Widget.H ../FL/fl_draw.H +Fl_Round_Button.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Round_Button.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Round_Button.o: ../FL/Fl_Round_Button.H ../FL/Fl_Light_Button.H Fl_Round_Button.o: ../FL/Fl_Button.H ../FL/Fl_Widget.H -Fl_Scroll.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Scroll.o: ../FL/Fl_Scroll.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -Fl_Scroll.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_Scroll.o: ../FL/fl_draw.H -Fl_Scrollbar.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Scrollbar.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_Scrollbar.o: ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Shared_Image.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H +Fl_Scroll.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Scroll.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Tiled_Image.H +Fl_Scroll.o: ../FL/Fl_Image.H ../FL/Fl_Scroll.H ../FL/Fl_Group.H +Fl_Scroll.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H +Fl_Scroll.o: ../FL/Fl_Valuator.H ../FL/fl_draw.H +Fl_Scrollbar.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Scrollbar.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Scrollbar.H +Fl_Scrollbar.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Widget.H +Fl_Scrollbar.o: ../FL/fl_draw.H +Fl_Shared_Image.o: ../FL/fl_utf8.H flstring.h ../FL/Fl_Export.H ../config.h +Fl_Shared_Image.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h Fl_Shared_Image.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Shared_Image.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H Fl_Shared_Image.o: ../FL/Fl_XBM_Image.H ../FL/Fl_Bitmap.H Fl_Shared_Image.o: ../FL/Fl_XPM_Image.H ../FL/Fl_Pixmap.H Fl_Single_Window.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H -Fl_Slider.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Slider.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Widget.H -Fl_Slider.o: ../FL/fl_draw.H -Fl_Tabs.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Tabs.H +Fl_Slider.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Slider.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Slider.H +Fl_Slider.o: ../FL/Fl_Valuator.H ../FL/Fl_Widget.H ../FL/fl_draw.H +Fl_Tabs.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Tabs.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Tabs.H Fl_Tabs.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Text_Buffer.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H +Fl_Text_Buffer.o: ../FL/fl_utf8.H flstring.h ../FL/Fl_Export.H ../config.h +Fl_Text_Buffer.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h Fl_Text_Buffer.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Text_Buffer.o: ../FL/Fl_Text_Buffer.H -Fl_Text_Display.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H +Fl_Text_Display.o: ../FL/fl_utf8.H flstring.h ../FL/Fl_Export.H ../config.h +Fl_Text_Display.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h Fl_Text_Display.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Text_Display.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H Fl_Text_Display.o: ../FL/fl_draw.H ../FL/Fl_Group.H ../FL/Fl_Widget.H Fl_Text_Display.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H Fl_Text_Display.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Window.H Fl_Text_Editor.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H +Fl_Text_Editor.o: ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h Fl_Text_Editor.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Text_Editor.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H Fl_Text_Editor.o: ../FL/fl_draw.H ../FL/Fl_Group.H ../FL/Fl_Widget.H Fl_Text_Editor.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H Fl_Text_Editor.o: ../FL/Fl_Text_Buffer.H ../FL/fl_ask.H -Fl_Tile.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Tile.H +Fl_Tile.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Tile.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Tile.H Fl_Tile.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Window.H -Fl_Tiled_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Tiled_Image.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Tiled_Image.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Tiled_Image.o: ../FL/Fl_Tiled_Image.H ../FL/Fl_Image.H ../FL/fl_draw.H -Fl_Tooltip.o: ../FL/Fl_Tooltip.H ../FL/Fl.H ../FL/Enumerations.H -Fl_Tooltip.o: ../FL/Fl_Export.H ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Tooltip.o: ../FL/Fl_Menu_Window.H ../FL/Fl_Single_Window.H -Fl_Tooltip.o: ../FL/Fl_Window.H -Fl_Valuator.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Valuator.o: ../FL/Fl_Valuator.H ../FL/Fl_Widget.H ../FL/math.h -Fl_Value_Input.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Tooltip.o: ../FL/Fl_Tooltip.H ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +Fl_Tooltip.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Tooltip.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/Fl_Menu_Window.H +Fl_Tooltip.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H +Fl_Valuator.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Valuator.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Valuator.H +Fl_Valuator.o: ../FL/Fl_Widget.H flstring.h ../FL/Fl_Export.H ../config.h +Fl_Value_Input.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Value_Input.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Value_Input.o: ../FL/Fl_Value_Input.H ../FL/Fl_Valuator.H Fl_Value_Input.o: ../FL/Fl_Widget.H ../FL/Fl_Input.H ../FL/Fl_Input_.H -Fl_Value_Input.o: ../FL/Fl_Group.H ../FL/math.h -Fl_Value_Output.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Value_Input.o: ../FL/Fl_Group.H +Fl_Value_Output.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Value_Output.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Value_Output.o: ../FL/Fl_Value_Output.H ../FL/Fl_Valuator.H Fl_Value_Output.o: ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Value_Slider.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Value_Slider.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Value_Slider.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Value_Slider.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H Fl_Value_Slider.o: ../FL/Fl_Valuator.H ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Widget.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Widget.o: ../FL/Fl_Widget.H ../FL/Fl_Group.H ../FL/Fl_Tooltip.H -Fl_Widget.o: ../FL/fl_draw.H -Fl_Window.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Window.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -Fl_Window_fullscreen.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Window_fullscreen.o: ../FL/x.H ../FL/Fl_Window.H -Fl_Window_hotspot.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Window_hotspot.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -Fl_Window_hotspot.o: ../FL/x.H ../FL/Fl_Window.H +Fl_Widget.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Widget.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Widget.H +Fl_Widget.o: ../FL/Fl_Group.H ../FL/Fl_Tooltip.H ../FL/fl_draw.H flstring.h +Fl_Widget.o: ../FL/Fl_Export.H ../config.h +Fl_Window.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Window.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H +Fl_Window.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H +Fl_Window_fullscreen.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Window_fullscreen.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H +Fl_Window_fullscreen.o: ../FL/Fl_Window.H +Fl_Window_hotspot.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Window_hotspot.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H +Fl_Window_hotspot.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/x.H +Fl_Window_hotspot.o: ../FL/Fl_Window.H Fl_Window_iconize.o: ../FL/x.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Window_iconize.o: ../FL/Fl_Window.H +Fl_Window_iconize.o: ../FL/Fl_Window.H ../FL/Xutf8.h Fl_Wizard.o: ../FL/Fl_Wizard.H ../FL/Fl_Group.H ../FL/Fl_Window.H Fl_Wizard.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Enumerations.H Fl_Wizard.o: ../FL/Fl_Export.H ../FL/fl_draw.H -Fl_XBM_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_XBM_Image.o: ../FL/Fl_XBM_Image.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H -Fl_XBM_Image.o: flstring.h ../FL/Fl_Export.H ../config.h -Fl_XPM_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_XPM_Image.o: ../FL/Fl_XPM_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_Image.H -Fl_XPM_Image.o: flstring.h ../FL/Fl_Export.H ../config.h -Fl_abort.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H flstring.h +Fl_XBM_Image.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_XBM_Image.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_XBM_Image.H +Fl_XBM_Image.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/fl_utf8.H flstring.h +Fl_XBM_Image.o: ../FL/Fl_Export.H ../config.h +Fl_XPM_Image.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_XPM_Image.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_XPM_Image.H +Fl_XPM_Image.o: ../FL/Fl_Pixmap.H ../FL/Fl_Image.H ../FL/fl_utf8.H flstring.h +Fl_XPM_Image.o: ../FL/Fl_Export.H ../config.h +Fl_abort.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_abort.o: ../FL/Enumerations.H ../FL/Fl_Export.H flstring.h Fl_abort.o: ../FL/Fl_Export.H ../config.h -Fl_add_idle.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_arg.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H -Fl_arg.o: ../FL/Fl_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_arg.o: ../FL/Fl_Widget.H ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H -Fl_arg.o: ../FL/filename.H ../FL/fl_draw.H flstring.h ../FL/Fl_Export.H -Fl_arg.o: ../config.h -Fl_compose.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_display.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H flstring.h +Fl_add_idle.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_add_idle.o: ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_arg.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_arg.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H +Fl_arg.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H +Fl_arg.o: ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H ../FL/filename.H +Fl_arg.o: ../FL/fl_draw.H flstring.h ../FL/Fl_Export.H ../config.h +Fl_compose.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_compose.o: ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_display.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_display.o: ../FL/Enumerations.H ../FL/Fl_Export.H flstring.h Fl_display.o: ../FL/Fl_Export.H ../config.h -Fl_get_key.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H +Fl_get_key.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_get_key.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H Fl_get_key.o: ../FL/Fl_Window.H -Fl_get_system_colors.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_get_system_colors.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_get_system_colors.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_get_system_colors.o: ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H -Fl_get_system_colors.o: ../FL/math.h flstring.h ../FL/Fl_Export.H ../config.h -Fl_get_system_colors.o: ../FL/Fl_Pixmap.H ../FL/Fl_Image.H +Fl_get_system_colors.o: ../FL/fl_utf8.H flstring.h ../FL/Fl_Export.H +Fl_get_system_colors.o: ../config.h ../FL/Fl_Pixmap.H ../FL/Fl_Image.H Fl_get_system_colors.o: ../FL/Fl_Tiled_Image.H tile.xpm -Fl_grab.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_grab.o: ../FL/x.H ../FL/Fl_Window.H -Fl_lock.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../config.h -Fl_own_colormap.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H -Fl_own_colormap.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H -Fl_visual.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_visual.o: ../FL/x.H ../FL/Fl_Window.H -Fl_x.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H -Fl_x.o: ../FL/Fl_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_x.o: ../FL/Fl_Widget.H flstring.h ../FL/Fl_Export.H ../config.h -filename_absolute.o: ../FL/filename.H flstring.h ../FL/Fl_Export.H -filename_absolute.o: ../config.h -filename_expand.o: ../FL/filename.H flstring.h ../FL/Fl_Export.H ../config.h +Fl_grab.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_grab.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H +Fl_lock.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_lock.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../config.h +Fl_own_colormap.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +Fl_own_colormap.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_own_colormap.o: ../FL/x.H ../FL/Fl_Window.H +Fl_visual.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +Fl_visual.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H +Fl_visual.o: ../FL/Fl_Window.H +Fl_x.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_x.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H +Fl_x.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/fl_utf8.H +Fl_x.o: flstring.h ../FL/Fl_Export.H +filename_absolute.o: ../FL/filename.H ../FL/fl_utf8.H flstring.h +filename_absolute.o: ../FL/Fl_Export.H ../config.h +filename_expand.o: ../FL/filename.H ../FL/fl_utf8.H flstring.h +filename_expand.o: ../FL/Fl_Export.H ../config.h filename_ext.o: ../FL/filename.H filename_isdir.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/filename.H +filename_isdir.o: ../FL/fl_utf8.H filename_list.o: ../FL/filename.H flstring.h ../FL/Fl_Export.H ../config.h +filename_list.o: ../FL/fl_utf8.H filename_match.o: ../FL/filename.H filename_setext.o: ../FL/filename.H flstring.h ../FL/Fl_Export.H ../config.h fl_arc.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/math.h fl_arci.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H -fl_arci.o: ../FL/Fl_Window.H -fl_ask.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H -fl_ask.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_ask.H -fl_ask.o: ../FL/Fl_Box.H ../FL/Fl_Widget.H ../FL/Fl_Button.H +fl_arci.o: ../FL/Fl_Window.H ../FL/Xutf8.h +fl_ask.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H ../FL/fl_utf8.H +fl_ask.o: ../FL/math.h ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +fl_ask.o: ../FL/fl_ask.H ../FL/Fl_Box.H ../FL/Fl_Widget.H ../FL/Fl_Button.H fl_ask.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H ../FL/Fl_Window.H fl_ask.o: ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H fl_ask.o: ../FL/Fl_Secret_Input.H ../FL/Fl_Input.H ../FL/x.H fl_ask.o: ../FL/Fl_Window.H ../FL/fl_draw.H -fl_boxtype.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_boxtype.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../config.h +fl_boxtype.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_boxtype.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Widget.H +fl_boxtype.o: ../FL/fl_draw.H ../config.h fl_color.o: Fl_XColor.H ../config.h ../FL/Enumerations.H ../FL/Fl_Export.H -fl_color.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/x.H ../FL/Fl_Window.H -fl_color.o: ../FL/fl_draw.H fl_cmap.h -fl_cursor.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_cursor.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/x.H -fl_cursor.o: ../FL/Fl_Window.H ../FL/fl_draw.H +fl_color.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_color.o: ../FL/Enumerations.H ../FL/x.H ../FL/Fl_Window.H ../FL/fl_draw.H +fl_color.o: fl_cmap.h +fl_cursor.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_cursor.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H +fl_cursor.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/x.H ../FL/Fl_Window.H +fl_cursor.o: ../FL/fl_draw.H fl_curve.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_diamond_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_diamond_box.o: ../FL/fl_draw.H -fl_dnd.o: fl_dnd_x.cxx ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_dnd.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/x.H -fl_dnd.o: ../FL/Fl_Window.H -fl_draw.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_draw.o: ../FL/Fl_Image.H flstring.h ../FL/Fl_Export.H ../config.h -fl_draw_image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_draw_image.o: ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H Fl_XColor.H -fl_draw_image.o: ../config.h ../FL/Enumerations.H flstring.h -fl_draw_image.o: ../FL/Fl_Export.H -fl_draw_pixmap.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_draw_pixmap.o: ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H flstring.h -fl_draw_pixmap.o: ../FL/Fl_Export.H ../config.h -fl_engraved_label.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_engraved_label.o: ../FL/Fl_Widget.H ../FL/fl_draw.H +fl_diamond_box.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_diamond_box.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H +fl_dnd.o: fl_dnd_x.cxx ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_dnd.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H +fl_dnd.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/x.H ../FL/Fl_Window.H +fl_draw.o: ../FL/fl_utf8.H ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +fl_draw.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +fl_draw.o: ../FL/fl_draw.H ../FL/Fl_Image.H flstring.h ../FL/Fl_Export.H +fl_draw.o: ../config.h +fl_draw_image.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_draw_image.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H +fl_draw_image.o: ../FL/x.H ../FL/Fl_Window.H Fl_XColor.H ../config.h +fl_draw_image.o: ../FL/Enumerations.H flstring.h ../FL/Fl_Export.H +fl_draw_pixmap.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_draw_pixmap.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H +fl_draw_pixmap.o: ../FL/x.H ../FL/Fl_Window.H flstring.h ../FL/Fl_Export.H +fl_draw_pixmap.o: ../config.h +fl_engraved_label.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_engraved_label.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Widget.H +fl_engraved_label.o: ../FL/fl_draw.H fl_file_dir.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/filename.H -fl_file_dir.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Enumerations.H -fl_file_dir.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H -fl_file_dir.o: ../FL/Fl_Widget.H ../FL/Fl_Group.H ../FL/Fl_Choice.H -fl_file_dir.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H +fl_file_dir.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/fl_utf8.H +fl_file_dir.o: ../FL/math.h ../FL/Xutf8.h ../FL/Enumerations.H +fl_file_dir.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H ../FL/Fl_Window.H +fl_file_dir.o: ../FL/Fl_Group.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H +fl_file_dir.o: ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H fl_file_dir.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Button.H -fl_file_dir.o: ../FL/Fl_Preferences.H ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H -fl_file_dir.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H -fl_file_dir.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_File_Icon.H -fl_file_dir.o: ../FL/Fl.H ../FL/filename.H ../FL/Fl_Box.H -fl_file_dir.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H +fl_file_dir.o: ../FL/Fl_Preferences.H ../FL/Fl_Tile.H ../FL/Fl_Group.H +fl_file_dir.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H +fl_file_dir.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H +fl_file_dir.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/filename.H +fl_file_dir.o: ../FL/Fl_Box.H ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H fl_file_dir.o: ../FL/Fl_Button.H ../FL/Fl_File_Input.H ../FL/Fl_Input.H fl_file_dir.o: ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H ../FL/fl_ask.H fl_font.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H -fl_font.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H ../FL/x.H -fl_font.o: ../FL/Fl_Window.H Fl_Font.H fl_font_x.cxx -fl_labeltype.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_labeltype.o: ../FL/Fl_Widget.H ../FL/Fl_Group.H ../FL/fl_draw.H -fl_labeltype.o: ../FL/Fl_Image.H ../FL/Fl_Input_.H ../FL/Fl_Widget.H -fl_line_style.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_line_style.o: ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H flstring.h -fl_line_style.o: ../FL/Fl_Export.H ../config.h -fl_oval_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_oval_box.o: ../FL/fl_draw.H +fl_font.o: ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h ../FL/Enumerations.H +fl_font.o: ../FL/Fl_Export.H ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Window.H +fl_font.o: Fl_Font.H ../FL/Xutf8.h fl_font_x.cxx +fl_labeltype.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_labeltype.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Widget.H +fl_labeltype.o: ../FL/Fl_Group.H ../FL/fl_draw.H ../FL/Fl_Image.H +fl_labeltype.o: ../FL/Fl_Input_.H ../FL/Fl_Widget.H +fl_line_style.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_line_style.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H +fl_line_style.o: ../FL/x.H ../FL/Fl_Window.H flstring.h ../FL/Fl_Export.H +fl_line_style.o: ../config.h +fl_oval_box.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_oval_box.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H fl_overlay.o: ../FL/x.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_overlay.o: ../FL/Fl_Window.H ../FL/fl_draw.H +fl_overlay.o: ../FL/Fl_Window.H ../FL/Xutf8.h ../FL/fl_draw.H fl_overlay_visual.o: ../config.h -fl_plastic.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_plastic.o: ../FL/fl_draw.H flstring.h ../FL/Fl_Export.H ../config.h +fl_plastic.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_plastic.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H +fl_plastic.o: flstring.h ../FL/Fl_Export.H ../config.h fl_read_image.o: ../FL/x.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_read_image.o: ../FL/Fl_Window.H ../FL/fl_draw.H flstring.h +fl_read_image.o: ../FL/Fl_Window.H ../FL/Xutf8.h ../FL/fl_draw.H flstring.h fl_read_image.o: ../FL/Fl_Export.H ../config.h -fl_rect.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/Enumerations.H -fl_rect.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H -fl_round_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_round_box.o: ../FL/fl_draw.H -fl_rounded_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_rounded_box.o: ../FL/fl_draw.H -fl_set_font.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H +fl_rect.o: ../config.h ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/Enumerations.H +fl_rect.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H ../FL/Xutf8.h +fl_round_box.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_round_box.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H +fl_rounded_box.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_rounded_box.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H +fl_set_font.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_set_font.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H fl_set_font.o: ../FL/Fl_Window.H flstring.h ../FL/Fl_Export.H ../config.h -fl_set_font.o: Fl_Font.H -fl_set_fonts.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H -fl_set_fonts.o: ../FL/Fl_Window.H Fl_Font.H flstring.h ../FL/Fl_Export.H -fl_set_fonts.o: ../config.h fl_set_fonts_x.cxx -fl_scroll_area.o: ../FL/x.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_scroll_area.o: ../FL/Fl_Window.H -fl_shadow_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_shadow_box.o: ../FL/fl_draw.H -fl_shortcut.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_shortcut.o: ../FL/Fl_Widget.H ../FL/Fl_Button.H ../FL/Fl_Widget.H -fl_shortcut.o: ../FL/fl_draw.H flstring.h ../FL/Fl_Export.H ../config.h -fl_shortcut.o: ../FL/x.H ../FL/Fl_Window.H -fl_show_colormap.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +fl_set_font.o: Fl_Font.H ../FL/Xutf8.h +fl_set_fonts.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_set_fonts.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H +fl_set_fonts.o: ../FL/Fl_Window.H Fl_Font.H ../config.h ../FL/Xutf8.h +fl_set_fonts.o: flstring.h ../FL/Fl_Export.H fl_set_fonts_x.cxx +fl_scroll_area.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +fl_scroll_area.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +fl_scroll_area.o: ../FL/x.H ../FL/Fl_Window.H +fl_shadow_box.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_shadow_box.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H +fl_shortcut.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_shortcut.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Widget.H +fl_shortcut.o: ../FL/Fl_Button.H ../FL/Fl_Widget.H ../FL/fl_draw.H flstring.h +fl_shortcut.o: ../FL/Fl_Export.H ../config.h ../FL/x.H ../FL/Fl_Window.H +fl_show_colormap.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_show_colormap.o: ../FL/Enumerations.H ../FL/Fl_Export.H fl_show_colormap.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H fl_show_colormap.o: ../FL/fl_draw.H ../FL/fl_show_colormap.H ../config.h -fl_symbols.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fl_symbols.o: ../FL/fl_draw.H flstring.h ../FL/Fl_Export.H ../config.h -fl_vertex.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H -fl_vertex.o: ../FL/Fl_Window.H ../FL/math.h -forms_compatability.o: ../FL/forms.H ../FL/Fl.H ../FL/Enumerations.H -forms_compatability.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -forms_compatability.o: ../FL/Fl_Window.H ../FL/fl_draw.H -forms_compatability.o: ../FL/Fl_FormsBitmap.H ../FL/Fl_Bitmap.H -forms_compatability.o: ../FL/Fl_Image.H ../FL/Fl_FormsPixmap.H -forms_compatability.o: ../FL/Fl_Pixmap.H ../FL/Fl_Box.H ../FL/Fl_Browser.H -forms_compatability.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H -forms_compatability.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -forms_compatability.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H -forms_compatability.o: ../FL/Fl_Round_Button.H ../FL/Fl_Check_Button.H -forms_compatability.o: ../FL/Fl_Chart.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H +fl_symbols.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +fl_symbols.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H +fl_symbols.o: flstring.h ../FL/Fl_Export.H ../config.h +fl_vertex.o: ../config.h ../FL/fl_draw.H ../FL/Enumerations.H +fl_vertex.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H ../FL/Xutf8.h +fl_vertex.o: ../FL/math.h +Fl_Shaped_Window.o: ../FL/Fl_Shaped_Window.H ../FL/Fl_Window.H +Fl_Shaped_Window.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Enumerations.H +Fl_Shaped_Window.o: ../FL/Fl_Export.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H +Fl_Shaped_Window.o: ../FL/x.H ../FL/Fl_Window.H ../FL/Xutf8.h +Fl_Table.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Table.o: ../FL/Fl_Table.H ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +Fl_Table.o: ../FL/Xutf8.h ../FL/Fl_Group.H ../FL/Fl_Scroll.H ../FL/Fl_Group.H +Fl_Table.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H +Fl_Table.o: ../FL/Fl_Valuator.H ../FL/Fl_Box.H ../FL/Fl_Scrollbar.H +Fl_Tree.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_Tree.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H +Fl_Tree.o: ../FL/fl_draw.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H +Fl_Tree.o: ../FL/Fl_Image.H ../FL/Fl_Tree.H ../FL/Fl_Scrollbar.H +Fl_Tree.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Group.H +Fl_Tree.o: ../FL/Fl_Box.H +fl_utf8.o: ../config.h ../xutf8/headers/spacing.h ../FL/filename.H +fl_utf8.o: ../FL/Xutf8.h ../FL/fl_utf8.H +forms_compatability.o: ../FL/forms.H ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +forms_compatability.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +forms_compatability.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Window.H +forms_compatability.o: ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H +forms_compatability.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H +forms_compatability.o: ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H +forms_compatability.o: ../FL/Fl_Box.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H +forms_compatability.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H +forms_compatability.o: ../FL/Fl_Valuator.H ../FL/Fl_Button.H +forms_compatability.o: ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H +forms_compatability.o: ../FL/Fl_Check_Button.H ../FL/Fl_Chart.H +forms_compatability.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H forms_compatability.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H forms_compatability.o: ../FL/Fl_Counter.H ../FL/Fl_Dial.H ../FL/Fl_Free.H forms_compatability.o: ../FL/fl_ask.H ../FL/fl_show_colormap.H forms_compatability.o: ../FL/filename.H ../FL/Fl_File_Chooser.H ../FL/Fl.H -forms_compatability.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Choice.H -forms_compatability.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Button.H -forms_compatability.o: ../FL/Fl_Preferences.H ../FL/Fl_Tile.H -forms_compatability.o: ../FL/Fl_File_Browser.H ../FL/Fl_File_Icon.H -forms_compatability.o: ../FL/Fl_Box.H ../FL/Fl_Check_Button.H -forms_compatability.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H -forms_compatability.o: ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H -forms_compatability.o: ../FL/fl_ask.H ../FL/Fl_Input.H ../FL/Fl_Menu_Button.H +forms_compatability.o: ../FL/Fl_Double_Window.H ../FL/Fl_Group.H +forms_compatability.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Button.H +forms_compatability.o: ../FL/Fl_Button.H ../FL/Fl_Preferences.H +forms_compatability.o: ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H +forms_compatability.o: ../FL/Fl_File_Icon.H ../FL/Fl_Box.H +forms_compatability.o: ../FL/Fl_Check_Button.H ../FL/Fl_File_Input.H +forms_compatability.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H +forms_compatability.o: ../FL/Fl_Return_Button.H ../FL/fl_ask.H +forms_compatability.o: ../FL/Fl_Input.H ../FL/Fl_Menu_Button.H forms_compatability.o: ../FL/Fl_Positioner.H ../FL/Fl_Value_Slider.H forms_compatability.o: ../FL/Fl_Timer.H ../FL/Fl_Repeat_Button.H -forms_bitmap.o: ../FL/forms.H ../FL/Fl.H ../FL/Enumerations.H -forms_bitmap.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -forms_bitmap.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H -forms_bitmap.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_FormsPixmap.H -forms_bitmap.o: ../FL/Fl_Pixmap.H ../FL/Fl_Box.H ../FL/Fl_Browser.H -forms_bitmap.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -forms_bitmap.o: ../FL/Fl_Valuator.H ../FL/Fl_Button.H ../FL/Fl_Light_Button.H +forms_bitmap.o: ../FL/forms.H ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +forms_bitmap.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +forms_bitmap.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Window.H +forms_bitmap.o: ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H ../FL/Fl_Bitmap.H +forms_bitmap.o: ../FL/Fl_Image.H ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H +forms_bitmap.o: ../FL/Fl_Box.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H +forms_bitmap.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H +forms_bitmap.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H forms_bitmap.o: ../FL/Fl_Round_Button.H ../FL/Fl_Check_Button.H forms_bitmap.o: ../FL/Fl_Chart.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H forms_bitmap.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H ../FL/Fl_Counter.H forms_bitmap.o: ../FL/Fl_Dial.H ../FL/Fl_Free.H ../FL/fl_ask.H forms_bitmap.o: ../FL/fl_show_colormap.H ../FL/filename.H -forms_bitmap.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Fl_Window.H +forms_bitmap.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Fl_Double_Window.H forms_bitmap.o: ../FL/Fl_Group.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Button.H forms_bitmap.o: ../FL/Fl_Button.H ../FL/Fl_Preferences.H ../FL/Fl_Tile.H forms_bitmap.o: ../FL/Fl_File_Browser.H ../FL/Fl_File_Icon.H ../FL/Fl_Box.H @@ -432,21 +540,23 @@ forms_bitmap.o: ../FL/fl_ask.H ../FL/Fl_Input.H ../FL/Fl_Menu_Button.H forms_bitmap.o: ../FL/Fl_Positioner.H ../FL/Fl_Value_Slider.H forms_bitmap.o: ../FL/Fl_Timer.H -forms_free.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -forms_free.o: ../FL/Fl_Free.H ../FL/Fl_Widget.H -forms_fselect.o: ../FL/forms.H ../FL/Fl.H ../FL/Enumerations.H -forms_fselect.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -forms_fselect.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H -forms_fselect.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_FormsPixmap.H -forms_fselect.o: ../FL/Fl_Pixmap.H ../FL/Fl_Box.H ../FL/Fl_Browser.H -forms_fselect.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -forms_fselect.o: ../FL/Fl_Valuator.H ../FL/Fl_Button.H -forms_fselect.o: ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H -forms_fselect.o: ../FL/Fl_Check_Button.H ../FL/Fl_Chart.H ../FL/Fl_Choice.H -forms_fselect.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H -forms_fselect.o: ../FL/Fl_Counter.H ../FL/Fl_Dial.H ../FL/Fl_Free.H -forms_fselect.o: ../FL/fl_ask.H ../FL/fl_show_colormap.H ../FL/filename.H -forms_fselect.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Fl_Window.H +forms_free.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +forms_free.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Free.H +forms_free.o: ../FL/Fl_Widget.H +forms_fselect.o: ../FL/forms.H ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +forms_fselect.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +forms_fselect.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Window.H +forms_fselect.o: ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H ../FL/Fl_Bitmap.H +forms_fselect.o: ../FL/Fl_Image.H ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H +forms_fselect.o: ../FL/Fl_Box.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H +forms_fselect.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H +forms_fselect.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H +forms_fselect.o: ../FL/Fl_Round_Button.H ../FL/Fl_Check_Button.H +forms_fselect.o: ../FL/Fl_Chart.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H +forms_fselect.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H ../FL/Fl_Counter.H +forms_fselect.o: ../FL/Fl_Dial.H ../FL/Fl_Free.H ../FL/fl_ask.H +forms_fselect.o: ../FL/fl_show_colormap.H ../FL/filename.H +forms_fselect.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Fl_Double_Window.H forms_fselect.o: ../FL/Fl_Group.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Button.H forms_fselect.o: ../FL/Fl_Button.H ../FL/Fl_Preferences.H ../FL/Fl_Tile.H forms_fselect.o: ../FL/Fl_File_Browser.H ../FL/Fl_File_Icon.H ../FL/Fl_Box.H @@ -455,19 +565,20 @@ forms_fselect.o: ../FL/fl_ask.H ../FL/Fl_Input.H ../FL/Fl_Menu_Button.H forms_fselect.o: ../FL/Fl_Positioner.H ../FL/Fl_Value_Slider.H forms_fselect.o: ../FL/Fl_Timer.H flstring.h ../FL/Fl_Export.H ../config.h -forms_pixmap.o: ../FL/forms.H ../FL/Fl.H ../FL/Enumerations.H -forms_pixmap.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -forms_pixmap.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H -forms_pixmap.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_FormsPixmap.H -forms_pixmap.o: ../FL/Fl_Pixmap.H ../FL/Fl_Box.H ../FL/Fl_Browser.H -forms_pixmap.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -forms_pixmap.o: ../FL/Fl_Valuator.H ../FL/Fl_Button.H ../FL/Fl_Light_Button.H +forms_pixmap.o: ../FL/forms.H ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +forms_pixmap.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +forms_pixmap.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Window.H +forms_pixmap.o: ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H ../FL/Fl_Bitmap.H +forms_pixmap.o: ../FL/Fl_Image.H ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H +forms_pixmap.o: ../FL/Fl_Box.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H +forms_pixmap.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H +forms_pixmap.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H forms_pixmap.o: ../FL/Fl_Round_Button.H ../FL/Fl_Check_Button.H forms_pixmap.o: ../FL/Fl_Chart.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H forms_pixmap.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H ../FL/Fl_Counter.H forms_pixmap.o: ../FL/Fl_Dial.H ../FL/Fl_Free.H ../FL/fl_ask.H forms_pixmap.o: ../FL/fl_show_colormap.H ../FL/filename.H -forms_pixmap.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Fl_Window.H +forms_pixmap.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Fl_Double_Window.H forms_pixmap.o: ../FL/Fl_Group.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Button.H forms_pixmap.o: ../FL/Fl_Button.H ../FL/Fl_Preferences.H ../FL/Fl_Tile.H forms_pixmap.o: ../FL/Fl_File_Browser.H ../FL/Fl_File_Icon.H ../FL/Fl_Box.H @@ -476,30 +587,39 @@ forms_pixmap.o: ../FL/fl_ask.H ../FL/Fl_Input.H ../FL/Fl_Menu_Button.H forms_pixmap.o: ../FL/Fl_Positioner.H ../FL/Fl_Value_Slider.H forms_pixmap.o: ../FL/Fl_Timer.H -forms_timer.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -forms_timer.o: ../FL/Fl_Timer.H ../FL/Fl_Widget.H ../FL/fl_draw.H -Fl_Gl_Choice.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Gl_Choice.o: ../FL/x.H ../FL/Fl_Window.H Fl_Gl_Choice.H flstring.h -Fl_Gl_Choice.o: ../FL/Fl_Export.H -Fl_Gl_Overlay.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H -Fl_Gl_Overlay.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H Fl_Gl_Choice.H +forms_timer.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +forms_timer.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Timer.H +forms_timer.o: ../FL/Fl_Widget.H ../FL/fl_draw.H +Fl_Gl_Choice.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +Fl_Gl_Choice.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Gl_Choice.o: ../FL/x.H ../FL/Fl_Window.H Fl_Gl_Choice.H ../FL/gl_draw.H +Fl_Gl_Choice.o: ../FL/gl.h flstring.h ../FL/Fl_Export.H ../FL/fl_utf8.H +Fl_Gl_Overlay.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +Fl_Gl_Overlay.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_Gl_Overlay.o: ../FL/x.H ../FL/Fl_Window.H Fl_Gl_Choice.H Fl_Gl_Overlay.o: ../FL/Fl_Gl_Window.H Fl_Gl_Window.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H +Fl_Gl_Window.o: ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h Fl_Gl_Window.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H Fl_Gl_Window.o: ../FL/Fl_Window.H Fl_Gl_Choice.H ../FL/Fl_Gl_Window.H +Fl_Gl_Window.o: ../FL/fl_utf8.H gl_draw.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H -gl_draw.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/gl.h ../FL/x.H -gl_draw.o: ../FL/Fl_Window.H ../FL/fl_draw.H Fl_Gl_Choice.H Fl_Font.H -gl_start.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -gl_start.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/x.H -gl_start.o: ../FL/Fl_Window.H ../FL/fl_draw.H Fl_Gl_Choice.H +gl_draw.o: ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h ../FL/Enumerations.H +gl_draw.o: ../FL/Fl_Export.H ../FL/gl.h ../FL/x.H ../FL/Fl_Window.H +gl_draw.o: ../FL/fl_draw.H Fl_Gl_Choice.H Fl_Font.H ../FL/Xutf8.h +gl_draw.o: ../FL/fl_utf8.H +gl_start.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +gl_start.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H +gl_start.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/x.H ../FL/Fl_Window.H +gl_start.o: ../FL/fl_draw.H Fl_Gl_Choice.H glut_compatability.o: ../config.h ../FL/glut.H ../FL/gl.h glut_compatability.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl.H +glut_compatability.o: ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h glut_compatability.o: ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H glut_compatability.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H glut_font.o: ../config.h ../FL/glut.H ../FL/gl.h ../FL/Enumerations.H -glut_font.o: ../FL/Fl_Export.H ../FL/Fl.H ../FL/Fl_Gl_Window.H -glut_font.o: ../FL/Fl_Window.H ../FL/gl.h +glut_font.o: ../FL/Fl_Export.H ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h +glut_font.o: ../FL/Xutf8.h ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H ../FL/gl.h fl_images_core.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H fl_images_core.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_BMP_Image.H fl_images_core.o: ../FL/Fl_GIF_Image.H ../FL/Fl_Pixmap.H @@ -508,29 +628,34 @@ fl_images_core.o: ../config.h Fl_BMP_Image.o: ../FL/Fl_BMP_Image.H ../FL/Fl_Image.H ../FL/Enumerations.H Fl_BMP_Image.o: ../FL/Fl_Export.H ../config.h -Fl_File_Icon2.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/math.h -Fl_File_Icon2.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/Enumerations.H -Fl_File_Icon2.o: ../FL/Fl_Export.H ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H -Fl_File_Icon2.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/filename.H -Fl_GIF_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_GIF_Image.o: ../FL/Fl_GIF_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_Image.H -Fl_GIF_Image.o: flstring.h ../FL/Fl_Export.H ../config.h -Fl_Help_Dialog.o: ../FL/Fl_Help_Dialog.H ../FL/Fl.H ../FL/Enumerations.H +Fl_File_Icon2.o: ../FL/fl_utf8.H flstring.h ../FL/Fl_Export.H ../config.h +Fl_File_Icon2.o: ../FL/math.h ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/fl_utf8.H +Fl_File_Icon2.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H +Fl_File_Icon2.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/Fl_Widget.H +Fl_File_Icon2.o: ../FL/fl_draw.H ../FL/filename.H +Fl_GIF_Image.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_GIF_Image.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_GIF_Image.H +Fl_GIF_Image.o: ../FL/Fl_Pixmap.H ../FL/Fl_Image.H ../FL/fl_utf8.H flstring.h +Fl_GIF_Image.o: ../FL/Fl_Export.H ../config.h +Fl_Help_Dialog.o: ../FL/Fl_Help_Dialog.H ../FL/Fl.H ../FL/fl_utf8.H +Fl_Help_Dialog.o: ../FL/math.h ../FL/Xutf8.h ../FL/Enumerations.H Fl_Help_Dialog.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H Fl_Help_Dialog.o: ../FL/Fl_Window.H ../FL/Fl_Help_View.H ../FL/Fl.H Fl_Help_Dialog.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H Fl_Help_Dialog.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H Fl_Help_Dialog.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/Fl_Button.H -Fl_Help_Dialog.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H flstring.h -Fl_Help_Dialog.o: ../FL/Fl_Export.H ../config.h ../FL/fl_ask.H +Fl_Help_Dialog.o: ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H +Fl_Help_Dialog.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/fl_ask.H Fl_JPEG_Image.o: ../FL/Fl_JPEG_Image.H ../FL/Fl_Image.H ../FL/Enumerations.H -Fl_JPEG_Image.o: ../FL/Fl_Export.H ../config.h -Fl_PNG_Image.o: ../FL/Fl_PNG_Image.H ../FL/Fl_Image.H ../FL/Enumerations.H -Fl_PNG_Image.o: ../FL/Fl_Export.H ../config.h -Fl_PNM_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_PNM_Image.o: ../FL/Fl_PNM_Image.H ../FL/Fl_Image.H flstring.h -Fl_PNM_Image.o: ../FL/Fl_Export.H ../config.h +Fl_JPEG_Image.o: ../FL/Fl_Export.H ../config.h ../FL/fl_utf8.H +Fl_PNG_Image.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_PNG_Image.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_PNG_Image.H +Fl_PNG_Image.o: ../FL/Fl_Image.H ../config.h ../FL/fl_utf8.H +Fl_PNM_Image.o: ../FL/Fl.H ../FL/fl_utf8.H ../FL/math.h ../FL/Xutf8.h +Fl_PNM_Image.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_PNM_Image.H +Fl_PNM_Image.o: ../FL/Fl_Image.H ../FL/fl_utf8.H flstring.h ../FL/Fl_Export.H +Fl_PNM_Image.o: ../config.h flstring.o: flstring.h ../FL/Fl_Export.H ../config.h -scandir.o: flstring.h ../FL/Fl_Export.H ../config.h +scandir.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/fl_utf8.H numericsort.o: ../config.h ../FL/filename.H vsnprintf.o: flstring.h ../FL/Fl_Export.H ../config.h diff -ur -- fltk-1.1.6/src/scandir.c fltk-utf8-1.1.6/src/scandir.c --- fltk-1.1.6/src/scandir.c 2002-05-04 13:37:41.000000000 +0100 +++ fltk-utf8-1.1.6/src/scandir.c 2005-06-12 19:06:28.000000000 +0100 @@ -21,6 +21,7 @@ #else # include "flstring.h" +# include # if !HAVE_SCANDIR # include @@ -49,7 +50,7 @@ int (*select)(struct dirent *), int (*compar)(struct dirent **, struct dirent **)) { - DIR *dp = opendir (dir); + DIR *dp = opendir (fl_utf2mbcs(dir)); struct dirent **v = NULL; size_t vsize = 0, i; struct dirent *d; diff -ur -- fltk-1.1.6/src/scandir_win32.c fltk-utf8-1.1.6/src/scandir_win32.c --- fltk-1.1.6/src/scandir_win32.c 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/src/scandir_win32.c 2005-06-12 19:06:28.000000000 +0100 @@ -1,9 +1,9 @@ /* - * "$Id: scandir_win32.c,v 1.11.2.4.2.9 2004/04/11 04:39:00 easysw Exp $" + * "$Id: scandir_win32.c,v 1.11.2.4.2.7 2003/05/28 16:38:09 matthiaswm Exp $" * * WIN32 scandir function for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2004 by Bill Spitzak and others. + * Copyright 1998-2003 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 @@ -25,26 +25,30 @@ #ifndef __CYGWIN__ /* Emulation of posix scandir() call */ - +#include #include #include "flstring.h" #include #include + +//extern char *fl_locale2utf8(const char *s, UINT codepage = 0); + int fl_scandir(const char *dirname, struct dirent ***namelist, int (*select)(struct dirent *), int (*compar)(struct dirent **, struct dirent **)) { int len; char *findIn, *d; WIN32_FIND_DATA find; + WIN32_FIND_DATAW findw; HANDLE h; int nDir = 0, NDir = 0; struct dirent **dir = 0, *selectDir; unsigned long ret; + unsigned short *wbuf; len = strlen(dirname); - findIn = malloc(len+5); - + findIn = (char*) malloc(len + 10); if (!findIn) return -1; strcpy(findIn, dirname); @@ -54,7 +58,15 @@ if ((len>0) && (d[-1]=='\\')) { *d++ = '*'; *d = 0; } if ((len>1) && (d[-1]=='.') && (d[-2]=='\\')) { d[-1] = '*'; } - if ((h=FindFirstFile(findIn, &find))==INVALID_HANDLE_VALUE) { + if (fl_is_nt4()) { + unsigned short * wbuf = (unsigned short*)malloc(sizeof(short) *(len + 10)); + wbuf[fl_utf2unicode(findIn, strlen(findIn), wbuf)] = 0; + h = FindFirstFileW(wbuf, &findw); + free(wbuf); + } else { + h=FindFirstFile(fl_utf2mbcs(findIn), &find); + } + if (h==INVALID_HANDLE_VALUE) { free(findIn); ret = GetLastError(); if (ret != ERROR_NO_MORE_FILES) { @@ -64,9 +76,25 @@ return nDir; } do { - selectDir=(struct dirent*)malloc(sizeof(struct dirent)+strlen(find.cFileName)+2); - strcpy(selectDir->d_name, find.cFileName); - if (find.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + int l; + if (fl_is_nt4()) { + l = wcslen(findw.cFileName); + } else { + l = strlen(find.cFileName); + } + selectDir=(struct dirent*)malloc(sizeof(struct dirent)+l * 5+1); + if (fl_is_nt4()) { + l = fl_unicode2utf(findw.cFileName, l, selectDir->d_name); + } else { + wbuf = (unsigned short*) malloc(sizeof(short) *(l+1)); + l = mbstowcs(wbuf, find.cFileName, l); + l = fl_unicode2utf(wbuf, l, selectDir->d_name); + free(wbuf); + } + selectDir->d_name[l] = 0; + if ((fl_is_nt4() && findw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || + (!fl_is_nt4() && find.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { // Append a trailing slash to directory names... strcat(selectDir->d_name, "/"); } @@ -84,7 +112,8 @@ } else { free(selectDir); } - } while (FindNextFile(h, &find)); + } while ((fl_is_nt4() && FindNextFileW(h, &findw)) || + (!fl_is_nt4() && FindNextFile(h, &find))); ret = GetLastError(); if (ret != ERROR_NO_MORE_FILES) { /* don't return an error code, because the dir list may still be valid @@ -104,5 +133,5 @@ #endif /* - * End of "$Id: scandir_win32.c,v 1.11.2.4.2.9 2004/04/11 04:39:00 easysw Exp $". + * End of "$Id: scandir_win32.c,v 1.11.2.4.2.7 2003/05/28 16:38:09 matthiaswm Exp $". */ diff -ur -- fltk-1.1.6/test/CubeMain.cxx fltk-utf8-1.1.6/test/CubeMain.cxx --- fltk-1.1.6/test/CubeMain.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/test/CubeMain.cxx 2005-06-12 19:06:31.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: CubeMain.cxx,v 1.2.2.5.2.4 2004/04/11 04:39:00 easysw Exp $" +// "$Id: CubeMain.cxx,v 1.2.2.5.2.3 2003/01/30 21:44:42 easysw Exp $" // // CubeView class definitions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -43,5 +43,5 @@ // -// End of "$Id: CubeMain.cxx,v 1.2.2.5.2.4 2004/04/11 04:39:00 easysw Exp $". +// End of "$Id: CubeMain.cxx,v 1.2.2.5.2.3 2003/01/30 21:44:42 easysw Exp $". // diff -ur -- fltk-1.1.6/test/CubeView.cxx fltk-utf8-1.1.6/test/CubeView.cxx --- fltk-1.1.6/test/CubeView.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/test/CubeView.cxx 2005-06-12 19:06:31.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: CubeView.cxx,v 1.4.2.4.2.5 2004/04/11 04:39:00 easysw Exp $" +// "$Id: CubeView.cxx,v 1.4.2.4.2.4 2003/01/30 21:44:43 easysw Exp $" // // CubeView class implementation for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -147,7 +147,7 @@ if (!valid()) { glLoadIdentity(); glViewport(0,0,w(),h()); - glOrtho(-10,10,-10,10,-20040,10000); + glOrtho(-10,10,-10,10,-20030,10000); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } @@ -167,5 +167,5 @@ #endif /* HAVE_GL */ // -// End of "$Id: CubeView.cxx,v 1.4.2.4.2.5 2004/04/11 04:39:00 easysw Exp $". +// End of "$Id: CubeView.cxx,v 1.4.2.4.2.4 2003/01/30 21:44:43 easysw Exp $". // Only in fltk-utf8-1.1.6/test: CubeViewUI.cxx Only in fltk-utf8-1.1.6/test: CubeViewUI.h diff -ur -- fltk-1.1.6/test/Makefile fltk-utf8-1.1.6/test/Makefile --- fltk-1.1.6/test/Makefile 2004-08-26 23:24:24.000000000 +0100 +++ fltk-utf8-1.1.6/test/Makefile 2005-06-12 19:06:33.000000000 +0100 @@ -87,7 +87,10 @@ threads.cxx \ tile.cxx \ tiled_image.cxx \ - valuators.cxx + valuators.cxx \ + dnd.cxx \ + tree.cxx \ + utf8.cxx ALL = \ unittests$(EXEEXT) \ @@ -143,7 +146,10 @@ $(THREADS) \ tile$(EXEEXT) \ tiled_image$(EXEEXT) \ - valuators$(EXEEXT) + valuators$(EXEEXT) \ + dnd$(EXEEXT) \ + tree$(EXEEXT) \ + utf8$(EXEEXT) GLALL = \ cube$(EXEEXT) \ diff -ur -- fltk-1.1.6/test/adjuster.cxx fltk-utf8-1.1.6/test/adjuster.cxx --- fltk-1.1.6/test/adjuster.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/test/adjuster.cxx 2005-06-12 19:06:29.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: adjuster.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:00 easysw Exp $" +// "$Id: adjuster.cxx,v 1.4.2.3.2.2 2003/01/30 21:44:49 easysw Exp $" // // Adjuster test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -60,5 +60,5 @@ } // -// End of "$Id: adjuster.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:00 easysw Exp $". +// End of "$Id: adjuster.cxx,v 1.4.2.3.2.2 2003/01/30 21:44:49 easysw Exp $". // diff -ur -- fltk-1.1.6/test/arc.cxx fltk-utf8-1.1.6/test/arc.cxx --- fltk-1.1.6/test/arc.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/test/arc.cxx 2005-06-12 19:06:29.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: arc.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:00 easysw Exp $" +// "$Id: arc.cxx,v 1.4.2.3.2.2 2003/01/30 21:44:50 easysw Exp $" // // Arc drawing test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -82,7 +82,7 @@ s->step(1); s->value(args[n]); s->align(FL_ALIGN_LEFT); - s->callback(slider_cb, (void*)n); + s->callback(slider_cb, (void*)((long)n)); } window.end(); @@ -92,6 +92,6 @@ // -// End of "$Id: arc.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:00 easysw Exp $". +// End of "$Id: arc.cxx,v 1.4.2.3.2.2 2003/01/30 21:44:50 easysw Exp $". // diff -ur -- fltk-1.1.6/test/ask.cxx fltk-utf8-1.1.6/test/ask.cxx --- fltk-1.1.6/test/ask.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/test/ask.cxx 2005-06-12 19:06:29.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: ask.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:00 easysw Exp $" +// "$Id: ask.cxx,v 1.4.2.3.2.3 2003/01/30 21:44:53 easysw Exp $" // // Standard dialog test program for the Fast Light Tool Kit (FLTK). // @@ -10,7 +10,7 @@ // This also demonstrates how to trap attempts by the user to // close the last window by overriding Fl::exit // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -74,5 +74,5 @@ } // -// End of "$Id: ask.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:00 easysw Exp $". +// End of "$Id: ask.cxx,v 1.4.2.3.2.3 2003/01/30 21:44:53 easysw Exp $". // diff -ur -- fltk-1.1.6/test/bitmap.cxx fltk-utf8-1.1.6/test/bitmap.cxx --- fltk-1.1.6/test/bitmap.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/test/bitmap.cxx 2005-06-12 19:06:29.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: bitmap.cxx,v 1.4.2.3.2.6 2004/04/11 04:39:00 easysw Exp $" +// "$Id: bitmap.cxx,v 1.4.2.3.2.5 2003/01/30 21:44:54 easysw Exp $" // // Bitmap label test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -25,9 +25,11 @@ #include #include +#include #include #include #include +#include #define sorceress_width 75 #define sorceress_height 75 @@ -116,8 +118,38 @@ w->redraw(); } +class My_Shaped_Window : public Fl_Shaped_Window +{ +public: + My_Shaped_Window(int x, int y, int w, int h) : + Fl_Shaped_Window(x, y, w, h) + { + ; + } + int handle(int e) { + int ret = Fl_Shaped_Window::handle(e); + if (e == FL_MOVE) { + position(x() + Fl::event_x() - 5, y() + Fl::event_y() - 5); + } else if (e == FL_PUSH) { + exit(0); + } + return ret; + } +}; int main(int argc, char **argv) { + Fl_Shaped_Window *s = new My_Shaped_Window(25, 21, sorceress_width,sorceress_height); + s->box(FL_FLAT_BOX); + s->shape(new Fl_Bitmap(sorceress_bits,sorceress_width,sorceress_height)); + s->color(FL_GREEN); + s->end(); + s->show(); + w = new Fl_Window(400,400); + s = new My_Shaped_Window(10, 110, sorceress_width,sorceress_height); + s->box(FL_FLAT_BOX); + s->shape(new Fl_Bitmap(sorceress_bits,sorceress_width,sorceress_height)); + s->color(FL_RED); + s->end(); b = new Fl_Button(140,160,120,120,"Bitmap"); b->image(new Fl_Bitmap(sorceress_bits,sorceress_width,sorceress_height)); leftb = new Fl_Toggle_Button(25,50,50,25,"left"); @@ -135,11 +167,13 @@ inactb = new Fl_Toggle_Button(125,75,100,25,"inactive"); inactb->callback(button_cb); w->resizable(w); + w->end(); w->show(argc, argv); + //s->show(); return Fl::run(); } // -// End of "$Id: bitmap.cxx,v 1.4.2.3.2.6 2004/04/11 04:39:00 easysw Exp $". +// End of "$Id: bitmap.cxx,v 1.4.2.3.2.5 2003/01/30 21:44:54 easysw Exp $". // diff -ur -- fltk-1.1.6/test/boxtype.cxx fltk-utf8-1.1.6/test/boxtype.cxx --- fltk-1.1.6/test/boxtype.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/test/boxtype.cxx 2005-06-12 19:06:29.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: boxtype.cxx,v 1.4.2.3.2.5 2004/04/11 04:39:00 easysw Exp $" +// "$Id: boxtype.cxx,v 1.4.2.3.2.4 2003/05/18 22:12:24 easysw Exp $" // // Boxtype test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -96,5 +96,5 @@ } // -// End of "$Id: boxtype.cxx,v 1.4.2.3.2.5 2004/04/11 04:39:00 easysw Exp $". +// End of "$Id: boxtype.cxx,v 1.4.2.3.2.4 2003/05/18 22:12:24 easysw Exp $". // diff -ur -- fltk-1.1.6/test/browser.cxx fltk-utf8-1.1.6/test/browser.cxx --- fltk-1.1.6/test/browser.cxx 2004-07-26 21:52:52.000000000 +0100 +++ fltk-utf8-1.1.6/test/browser.cxx 2005-06-12 19:06:29.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: browser.cxx,v 1.5.2.6.2.7 2004/07/26 20:52:52 easysw Exp $" +// "$Id: browser.cxx,v 1.5.2.6.2.5 2003/01/30 21:44:59 easysw Exp $" // // Browser test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -74,8 +74,7 @@ Fl_Button *top, *bottom, *middle, - *visible, - *swap; + *visible; Fl_Int_Input *field; void b_cb(Fl_Widget* o, void*) { @@ -102,19 +101,6 @@ browser->make_visible(line); } -void swap_cb(Fl_Widget *o, void *) { - int a = -1, b = -1; - for ( int t=0; tsize(); t++ ) { // find two selected items - if ( browser->selected(t) ) { - if ( a < 0 ) - { a = t; } - else - { b = t; break; } - } - } - browser->swap(a, b); // swap them -} - int main(int argc, char **argv) { int i; if (!Fl::args(argc,argv,i)) Fl::fatal(Fl::help); @@ -143,6 +129,18 @@ printf("Can't load %s, %s\n", fname, strerror(errno)); exit(1); } +#elif __MACOS__ + int done = 1; + if ( 1 ) + { + fname = "../../../browser.cxx"; + done = browser->load(fname); + } + if ( !done ) + { + printf("Can't load %s, %s\n", fname, strerror(errno)); + exit(1); + } #else printf("Can't load %s, %s\n", fname, strerror(errno)); exit(1); @@ -153,28 +151,24 @@ field = new Fl_Int_Input(50, 350, 350, 25, "Line #:"); field->callback(show_cb); - top = new Fl_Button(0, 375, 80, 25, "Top"); + top = new Fl_Button(0, 375, 100, 25, "Top"); top->callback(show_cb); - bottom = new Fl_Button(80, 375, 80, 25, "Bottom"); + bottom = new Fl_Button(100, 375, 100, 25, "Bottom"); bottom->callback(show_cb); - middle = new Fl_Button(160, 375, 80, 25, "Middle"); + middle = new Fl_Button(200, 375, 100, 25, "Middle"); middle->callback(show_cb); - visible = new Fl_Button(240, 375, 80, 25, "Make Vis."); + visible = new Fl_Button(300, 375, 100, 25, "Make Vis."); visible->callback(show_cb); - swap = new Fl_Button(320, 375, 80, 25, "Swap"); - swap->callback(swap_cb); - swap->tooltip("Swaps two selected lines\n(Use CTRL-click to select two lines)"); - window.resizable(browser); window.show(argc,argv); return Fl::run(); } // -// End of "$Id: browser.cxx,v 1.5.2.6.2.7 2004/07/26 20:52:52 easysw Exp $". +// End of "$Id: browser.cxx,v 1.5.2.6.2.5 2003/01/30 21:44:59 easysw Exp $". // diff -ur -- fltk-1.1.6/test/button.cxx fltk-utf8-1.1.6/test/button.cxx --- fltk-1.1.6/test/button.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/test/button.cxx 2005-06-12 19:06:29.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: button.cxx,v 1.4.2.4.2.3 2004/04/11 04:39:00 easysw Exp $" +// "$Id: button.cxx,v 1.4.2.4.2.2 2003/01/30 21:45:01 easysw Exp $" // // Button/callback test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -62,5 +62,5 @@ } // -// End of "$Id: button.cxx,v 1.4.2.4.2.3 2004/04/11 04:39:00 easysw Exp $". +// End of "$Id: button.cxx,v 1.4.2.4.2.2 2003/01/30 21:45:01 easysw Exp $". // diff -ur -- fltk-1.1.6/test/buttons.cxx fltk-utf8-1.1.6/test/buttons.cxx --- fltk-1.1.6/test/buttons.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/test/buttons.cxx 2005-06-12 19:06:29.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: buttons.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:00 easysw Exp $" +// "$Id: buttons.cxx,v 1.4.2.3.2.3 2003/01/30 21:45:02 easysw Exp $" // // Another button test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -49,5 +49,5 @@ } // -// End of "$Id: buttons.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:00 easysw Exp $". +// End of "$Id: buttons.cxx,v 1.4.2.3.2.3 2003/01/30 21:45:02 easysw Exp $". // diff -ur -- fltk-1.1.6/test/checkers.cxx fltk-utf8-1.1.6/test/checkers.cxx --- fltk-1.1.6/test/checkers.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/test/checkers.cxx 2005-06-12 19:10:06.000000000 +0100 @@ -1,12 +1,12 @@ // -// "$Id: checkers.cxx,v 1.9.2.7.2.5 2004/04/11 04:39:00 easysw Exp $" +// "$Id: checkers.cxx,v 1.9.2.7.2.4 2003/01/30 21:45:04 easysw Exp $" // // Checkers game for the Fast Light Tool Kit (FLTK). // // Hours of fun: the FLTK checkers game! // Based on a very old algorithim, but it still works! // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -177,7 +177,7 @@ #define ENEMY WHITE #define ENEMYKING WHITEKING -char check(int target,int direction) { +char checkit(int target,int direction) { // see if enemy at target can be jumped from direction by our piece int dst = target-direction; if (tb[dst]) return(0); @@ -205,12 +205,12 @@ if (!tb[target]) { if (!tb[target+direction]) is_protected[target] = 1; piece a = tb[src]; tb[src] = EMPTY; - if (check(target,4) || check(target,5) || - check(target,-4) || check(target,-5) || - (tb[src+4]&ENEMY && check(src+4,4)) || - (tb[src+5]&ENEMY && check(src+5,5)) || - (tb[src-4]&ENEMY && check(src-4,-4)) || - (tb[src-5]&ENEMY && check(src-5,-5))) + if (checkit(target,4) || checkit(target,5) || + checkit(target,-4) || checkit(target,-5) || + (tb[src+4]&ENEMY && checkit(src+4,4)) || + (tb[src+5]&ENEMY && checkit(src+5,5)) || + (tb[src-4]&ENEMY && checkit(src-4,-4)) || + (tb[src-5]&ENEMY && checkit(src-5,-5))) deniedmoves++; else undeniedmoves++; tb[src] = a; @@ -221,7 +221,7 @@ if (!n->who) tb = b; // move was black's else { - for (int i=0; i<45; i++) flipboard[44-i] = flip[b[i]]; + for (int i=0; i<45; i++) flipboard[44-i] = flip[(int)b[i]]; tb = flipboard; } @@ -413,7 +413,7 @@ static char jumphappened; for (int k=0; k<4; k++) { - int direction = offset[b[i]][k]; + int direction = offset[(int)b[i]][k]; if (!direction) break; int j = i+direction; if (b[j] == EMPTY) { @@ -1343,7 +1343,7 @@ fprintf(stderr," -t : use VT100 display\n", Fl::help); exit(1); } - if (!getenv("DISPLAY")) terminal = 1; + if (!fl_getenv("DISPLAY")) terminal = 1; if (!terminal) #endif #ifdef FLTK @@ -1355,5 +1355,5 @@ } // -// End of "$Id: checkers.cxx,v 1.9.2.7.2.5 2004/04/11 04:39:00 easysw Exp $". +// End of "$Id: checkers.cxx,v 1.9.2.7.2.4 2003/01/30 21:45:04 easysw Exp $". // diff -ur -- fltk-1.1.6/test/clock.cxx fltk-utf8-1.1.6/test/clock.cxx --- fltk-1.1.6/test/clock.cxx 2004-04-11 05:39:00.000000000 +0100 +++ fltk-utf8-1.1.6/test/clock.cxx 2005-06-12 19:06:29.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: clock.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:00 easysw Exp $" +// "$Id: clock.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:07 easysw Exp $" // // Clock test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -47,5 +47,5 @@ } // -// End of "$Id: clock.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:00 easysw Exp $". +// End of "$Id: clock.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:07 easysw Exp $". // diff -ur -- fltk-1.1.6/test/colbrowser.cxx fltk-utf8-1.1.6/test/colbrowser.cxx --- fltk-1.1.6/test/colbrowser.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/colbrowser.cxx 2005-06-12 19:06:29.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: colbrowser.cxx,v 1.5.2.5.2.3 2004/04/11 04:39:01 easysw Exp $" +// "$Id: colbrowser.cxx,v 1.5.2.5.2.2 2003/01/30 21:45:08 easysw Exp $" // // Forms test program for the Fast Light Tool Kit (FLTK). // @@ -8,7 +8,7 @@ // using fltk's Forms emulation. Search for "fltk" to find all the // changes // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -32,6 +32,7 @@ #include #include // added for fltk #include // added for fltk +#include #define MAX_RGB 3000 @@ -154,9 +155,9 @@ int r, g, b, lr = -1 , lg = -1, lb = -1; char name[256], buf[256]; #ifdef __EMX__ - if (!(fp = fopen(__XOS2RedirRoot(fname), "r"))) + if (!(fp = fl_fopen(__XOS2RedirRoot(fname), "r"))) #else - if (!(fp = fopen(fname, "r"))) + if (!(fp = fl_fopen(fname, "r"))) #endif { fl_show_alert("Load", fname, "Can't open", 0); @@ -341,5 +342,5 @@ } // -// End of "$Id: colbrowser.cxx,v 1.5.2.5.2.3 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: colbrowser.cxx,v 1.5.2.5.2.2 2003/01/30 21:45:08 easysw Exp $". // diff -ur -- fltk-1.1.6/test/color_chooser.cxx fltk-utf8-1.1.6/test/color_chooser.cxx --- fltk-1.1.6/test/color_chooser.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/color_chooser.cxx 2005-06-12 19:06:30.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: color_chooser.cxx,v 1.6.2.3.2.5 2004/04/11 04:39:01 easysw Exp $" +// "$Id: color_chooser.cxx,v 1.6.2.3.2.4 2003/01/30 21:45:10 easysw Exp $" // // Color chooser test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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,7 +35,7 @@ #include #include -#if !defined(WIN32) && !defined(__APPLE__) +#if !defined(WIN32) && !defined(__MACOS__) && !NANO_X #include "list_visuals.cxx" #endif @@ -115,7 +115,7 @@ " - : default visual\n" " r : call Fl::visual(FL_RGB)\n" " c : call Fl::own_colormap()\n",argv[0]); -#if !defined(WIN32) && !defined(__APPLE__) +#if !defined(WIN32) && !defined(__MACOS__) && !NANO_X printf(" # : use this visual with an empty colormap:\n"); list_visuals(); #endif @@ -127,7 +127,7 @@ } else if (argv[i][0] == 'c') { Fl::own_colormap(); } else if (argv[i][0] != '-') { -#if !defined(WIN32) && !defined(__APPLE__) +#if !defined(WIN32) && !defined(__MACOS__) && !NANO_X int visid = atoi(argv[i]); fl_open_display(); XVisualInfo templt; int num; @@ -146,5 +146,5 @@ } // -// End of "$Id: color_chooser.cxx,v 1.6.2.3.2.5 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: color_chooser.cxx,v 1.6.2.3.2.4 2003/01/30 21:45:10 easysw Exp $". // diff -ur -- fltk-1.1.6/test/connect.cxx fltk-utf8-1.1.6/test/connect.cxx --- fltk-1.1.6/test/connect.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/connect.cxx 2005-06-12 19:06:30.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: connect.cxx,v 1.4.2.4.2.3 2004/04/11 04:39:01 easysw Exp $" +// "$Id: connect.cxx,v 1.4.2.4.2.2 2003/01/30 21:45:15 easysw Exp $" // // PPP example program for the Fast Light Tool Kit (FLTK). // @@ -7,7 +7,7 @@ // You must chmod +s /usr/sbin/pppd, and put all the options // into /etc/ppp/options. // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -71,5 +71,5 @@ } // -// End of "$Id: connect.cxx,v 1.4.2.4.2.3 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: connect.cxx,v 1.4.2.4.2.2 2003/01/30 21:45:15 easysw Exp $". // diff -ur -- fltk-1.1.6/test/cube.cxx fltk-utf8-1.1.6/test/cube.cxx --- fltk-1.1.6/test/cube.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/cube.cxx 2005-06-12 19:06:30.000000000 +0100 @@ -1,11 +1,11 @@ // -// "$Id: cube.cxx,v 1.4.2.5.2.7 2004/04/11 04:39:01 easysw Exp $" +// "$Id: cube.cxx,v 1.4.2.5.2.6 2003/01/30 21:45:16 easysw Exp $" // // Another forms test program for the Fast Light Tool Kit (FLTK). // // Modified to have 2 cubes to test multiple OpenGL contexts // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -104,7 +104,7 @@ glEnable(GL_DEPTH_TEST); glFrustum(-1,1,-1,1,2,10000); glTranslatef(0,0,-10); - gl_font(FL_HELVETICA_BOLD, 16 ); + gl_font(FL_HELVETICA, 32 ); } glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glPushMatrix(); @@ -113,12 +113,18 @@ glRotatef(float(lasttime*2.3),0,1,0); glTranslatef(-1.0, 1.2f, -1.5); glScalef(float(size),float(size),float(size)); + drawcube(wire); + glEnable(GL_DEPTH_TEST); glPopMatrix(); - gl_color(FL_GRAY); glDisable(GL_DEPTH_TEST); - gl_draw(wire ? "Cube: wire" : "Cube: flat", -4.5f, -4.5f ); - glEnable(GL_DEPTH_TEST); + static char buf[80]; + unsigned short b[] = {'U', 'T', 'F', 0xAE, 0xA9, 0x39e}; + int l = fl_unicode2utf((xchar*)b, 6, buf); + buf[l] = 0; + gl_color(FL_GRAY); + gl_draw(wire ? "Cube: wire" : buf, 0, 0); + } #endif @@ -184,5 +190,5 @@ } // -// End of "$Id: cube.cxx,v 1.4.2.5.2.7 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: cube.cxx,v 1.4.2.5.2.6 2003/01/30 21:45:16 easysw Exp $". // diff -ur -- fltk-1.1.6/test/cursor.cxx fltk-utf8-1.1.6/test/cursor.cxx --- fltk-1.1.6/test/cursor.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/cursor.cxx 2005-06-12 19:06:31.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: cursor.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $" +// "$Id: cursor.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:19 easysw Exp $" // // Cursor test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -159,5 +159,5 @@ } // -// End of "$Id: cursor.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: cursor.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:19 easysw Exp $". // diff -ur -- fltk-1.1.6/test/curve.cxx fltk-utf8-1.1.6/test/curve.cxx --- fltk-1.1.6/test/curve.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/curve.cxx 2005-06-12 19:06:32.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: curve.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $" +// "$Id: curve.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:20 easysw Exp $" // // Curve test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -38,6 +38,7 @@ class Drawing : public Fl_Widget { void draw() { + fl_line_style(FL_SOLID, 5); fl_clip(x(),y(),w(),h()); fl_color(FL_DARK3); fl_rectf(x(),y(),w(),h()); @@ -49,11 +50,12 @@ } fl_translate(x(),y()); if (!points) { - fl_color(FL_WHITE); - fl_begin_complex_polygon(); - fl_curve(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7]); - fl_end_complex_polygon(); + fl_color(FL_WHITE); + fl_begin_complex_polygon(); + fl_curve(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7]); + fl_end_complex_polygon(); } + fl_color(FL_BLACK); fl_begin_line(); fl_vertex(args[0],args[1]); @@ -63,6 +65,7 @@ fl_end_line(); fl_color(points ? FL_WHITE : FL_RED); points ? fl_begin_points() : fl_begin_line(); + fl_line_style(FL_SOLID, 1); fl_curve(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7]); points ? fl_end_points() : fl_end_line(); fl_pop_matrix(); @@ -91,7 +94,7 @@ d = &drawing; int y = 300; - for (int n = 0; n<9; n++) { + for (long n = 0; n<9; n++) { Fl_Slider* s = new Fl_Hor_Value_Slider(50,y,240,25,name[n]); y += 25; s->minimum(0); s->maximum(280); if (n == 8) s->maximum(360); @@ -109,5 +112,5 @@ } // -// End of "$Id: curve.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: curve.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:20 easysw Exp $". // diff -ur -- fltk-1.1.6/test/demo.cxx fltk-utf8-1.1.6/test/demo.cxx --- fltk-1.1.6/test/demo.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/demo.cxx 2005-06-12 19:10:40.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: demo.cxx,v 1.8.2.5.2.9 2004/04/11 04:39:01 easysw Exp $" +// "$Id: demo.cxx,v 1.8.2.5.2.8 2003/01/30 21:45:22 easysw Exp $" // // Main demo program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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,6 +26,8 @@ #include #include #include +#include + #if defined(WIN32) && !defined(__CYGWIN__) # include #else @@ -176,7 +178,7 @@ if (menus[men].icommand[i][0] != '@') but[bn]->tooltip(menus[men].icommand[i]); else but[bn]->tooltip(0); } - strcpy(stack[stsize],nnn); + strcpy(stack[(int)stsize],nnn); stsize++; } @@ -185,7 +187,7 @@ { if (stsize<=1) return; stsize -= 2; - push_menu(stack[stsize]); + push_menu(stack[(int)stsize]); } /* The callback Routines */ @@ -275,7 +277,7 @@ FILE *fin; char line[256], mname[64],iname[64],cname[64]; int i,j; - fin = fopen(fname,"r"); + fin = fl_fopen(fname,"r"); if (fin == NULL) { // fl_show_message("ERROR","","Cannot read the menu description file."); @@ -340,6 +342,6 @@ } // -// End of "$Id: demo.cxx,v 1.8.2.5.2.9 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: demo.cxx,v 1.8.2.5.2.8 2003/01/30 21:45:22 easysw Exp $". // Only in fltk-utf8-1.1.6/test: dnd.cxx diff -ur -- fltk-1.1.6/test/doublebuffer.cxx fltk-utf8-1.1.6/test/doublebuffer.cxx --- fltk-1.1.6/test/doublebuffer.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/doublebuffer.cxx 2005-06-12 19:06:32.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: doublebuffer.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:01 easysw Exp $" +// "$Id: doublebuffer.cxx,v 1.4.2.3.2.3 2003/01/30 21:45:24 easysw Exp $" // // Double-buffering test program for the Fast Light Tool Kit (FLTK). // @@ -13,7 +13,7 @@ // This demo should work for both the GL and X versions of Fl, // even though the double buffering mechanism is totally different. // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -122,5 +122,5 @@ } // -// End of "$Id: doublebuffer.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: doublebuffer.cxx,v 1.4.2.3.2.3 2003/01/30 21:45:24 easysw Exp $". // diff -ur -- fltk-1.1.6/test/editor.cxx fltk-utf8-1.1.6/test/editor.cxx --- fltk-1.1.6/test/editor.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/editor.cxx 2005-06-12 19:06:32.000000000 +0100 @@ -1,11 +1,11 @@ // -// "$Id: editor.cxx,v 1.2.2.3.2.18 2004/04/11 04:39:01 easysw Exp $" +// "$Id: editor.cxx,v 1.2.2.3.2.17 2003/01/30 21:45:24 easysw Exp $" // // A simple text editor program for the Fast Light Tool Kit (FLTK). // // This program is described in Chapter 4 of the FLTK Programmer's Guide. // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -52,6 +52,7 @@ #include + int changed = 0; char filename[256] = ""; char title[256]; @@ -327,8 +328,8 @@ void *cbArg) { // I - Callback data int start, // Start of text end; // End of text - char last, // Last style on line - *style, // Style data + char last; // Last style on line + char *style, // Style data *text; // Text data @@ -341,12 +342,12 @@ // Track changes in the text buffer... if (nInserted > 0) { // Insert characters into the style buffer... - style = new char[nInserted + 1]; + style = (char*)malloc(nInserted + 1); memset(style, 'A', nInserted); style[nInserted] = '\0'; stylebuf->replace(pos, pos + nDeleted, style); - delete[] style; + free(style); } else { // Just delete characters in the style buffer... stylebuf->remove(pos, pos + nDeleted); @@ -420,8 +421,16 @@ Fl_Text_Editor *editor; char search[256]; + + void resize(int X, int Y, int W, int H); }; +void EditorWindow::resize(int X, int Y, int W, int H) +{ + fl_set_status(25, H - 25, W - 70, 25); + Fl_Double_Window::resize(X, Y, W, H); +} + 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(80, 10, 210, 25, "Find:"); @@ -442,6 +451,7 @@ replace_dlg->set_non_modal(); editor = 0; *search = (char)0; + fl_set_status(25, h - 25, w - 70, 25); } EditorWindow::~EditorWindow() { @@ -758,11 +768,15 @@ } int main(int argc, char **argv) { + textbuf = new Fl_Text_Buffer; style_init(); Fl_Window* window = new_view(); + Fl::set_font(FL_COURIER, + "-*-courier-medium-r-normal--*-iso8859-1, *-jisx0208.1983-*"); + window->show(1, argv); if (argc > 1) load_file(argv[1], -1); @@ -771,5 +785,5 @@ } // -// End of "$Id: editor.cxx,v 1.2.2.3.2.18 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: editor.cxx,v 1.2.2.3.2.17 2003/01/30 21:45:24 easysw Exp $". // Only in fltk-utf8-1.1.6/test: fast_slow.cxx Only in fltk-utf8-1.1.6/test: fast_slow.h diff -ur -- fltk-1.1.6/test/file_chooser.cxx fltk-utf8-1.1.6/test/file_chooser.cxx --- fltk-1.1.6/test/file_chooser.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/file_chooser.cxx 2005-06-12 19:06:32.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: file_chooser.cxx,v 1.4.2.3.2.11 2004/04/11 04:39:01 easysw Exp $" +// "$Id: file_chooser.cxx,v 1.4.2.3.2.8 2002/07/14 18:19:00 easysw Exp $" // // File chooser test program. // -// Copyright 1999-2004 by Michael Sweet. +// Copyright 1999-2002 by Michael Sweet. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -45,7 +45,7 @@ #include #include #include "../src/flstring.h" - +#include // // Globals... @@ -219,7 +219,7 @@ if (memcmp(header, "%PDF", 4) != 0) return 0; - home = getenv("HOME"); + home = fl_getenv("HOME"); snprintf(preview, sizeof(preview), "%s/.preview.ppm", home ? home : ""); snprintf(command, sizeof(command), @@ -255,7 +255,7 @@ if (memcmp(header, "%!", 2) != 0) return 0; - home = getenv("HOME"); + home = fl_getenv("HOME"); snprintf(preview, sizeof(preview), "%s/.preview.ppm", home ? home : ""); if (memcmp(header, "%!PS", 4) == 0) { @@ -263,8 +263,8 @@ snprintf(outname, sizeof(outname), "%s/.preview.ps", home ? home : ""); if (strcmp(name, outname) != 0) { - in = fopen(name, "rb"); - out = fopen(outname, "wb"); + in = fl_fopen(name, "rb"); + out = fl_fopen(outname, "wb"); page = 0; while (fgets(line, sizeof(line), in) != NULL) { @@ -323,9 +323,6 @@ for (i = 1; i <= count; i ++) { - if (!fc->value(i)) - break; - fl_filename_relative(relative, sizeof(relative), fc->value(i)); files->add(relative, @@ -336,7 +333,89 @@ } } +#if defined(WIN32) && defined(FL_DLL0) && !defined (__GNUC__) + +#include +#include +#include +#include + +#ifdef __MWERKS__ +# include +#endif + +extern int main(int, char *[]); + +#ifdef BORLAND5 +# define __argc _argc +# define __argv _argv +#endif + +static int mbcs2utf(const char *s, int l, char *buf) +{ + xchar *mbwbuf; + if (!s) return 0; + mbwbuf = (xchar*)malloc((l * 6 +6) * sizeof(xchar)); + l = mbstowcs(mbwbuf, s, l); + l = fl_unicode2utf(mbwbuf, l, buf); + free(mbwbuf); + return l; +} + +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, + LPSTR lpCmdLine, int nCmdShow) { + int rc, i; + char **ar; + +#ifdef _DEBUG + /* + * If we are using compiling in debug mode, open a console window so + * we can see any printf's, etc... + * + * While we can detect if the program was run from the command-line - + * look at the CMDLINE environment variable, it will be "WIN" for + * programs started from the GUI - the shell seems to run all WIN32 + * applications in the background anyways... + */ + + AllocConsole(); + freopen("conin$", "r", stdin); + freopen("conout$", "w", stdout); + freopen("conout$", "w", stderr); +#endif /* _DEBUG */ + + + ar = (char**) malloc(sizeof(char*) * (__argc + 1)); + i = 0; + while (i < __argc) { + int l; + if (__wargv && fl_is_nt4()) { + for (l = 0; __wargv[i] && __wargv[i][l]; l++) {}; + ar[i] = (char*) malloc((l * 5) + 1); + ar[i][fl_unicode2utf(__wargv[i], l, ar[i])] = 0; + } else { + for (l = 0; __argv[i] && __argv[i][l]; l++) {}; + ar[i] = (char*) malloc((l * 5) + 1); + ar[i][mbcs2utf(__argv[i], l, ar[i])] = 0; + } + i++; + } + ar[__argc] = 0; + + /* Run the standard main entry point function... */ + rc = main(__argc, ar); + +#ifdef _DEBUG + fclose(stdin); + fclose(stdout); + fclose(stderr); +#endif /* _DEBUG */ + + return rc; +} + +#endif // -// End of "$Id: file_chooser.cxx,v 1.4.2.3.2.11 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: file_chooser.cxx,v 1.4.2.3.2.8 2002/07/14 18:19:00 easysw Exp $". // diff -ur -- fltk-1.1.6/test/fl_jpeg_image.cxx fltk-utf8-1.1.6/test/fl_jpeg_image.cxx --- fltk-1.1.6/test/fl_jpeg_image.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/fl_jpeg_image.cxx 2005-06-12 19:06:32.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: fl_jpeg_image.cxx,v 1.5.2.3.2.3 2004/04/11 04:39:01 easysw Exp $" +// "$Id: fl_jpeg_image.cxx,v 1.5.2.3.2.2 2003/01/30 21:45:28 easysw Exp $" // // fl_draw_image test program for the Fast Light Tool Kit (FLTK). // @@ -20,7 +20,7 @@ // The makefile assummes you decompressed and build these in a directory // called "jpeg-6a" in the same location as the "FL" directory. // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -44,6 +44,7 @@ #include #include #include +#include void readtheimage(const char *name); // below int width; @@ -136,7 +137,7 @@ void readtheimage(const char *name) { struct jpeg_decompress_struct cinfo; struct jpeg_error_mgr jerr; - FILE * infile = fopen(name, "rb"); + FILE * infile = fl_fopen(name, "rb"); if (!infile) { fprintf(stderr, "can't open %s\n", name); exit(1); @@ -197,5 +198,5 @@ #endif // -// End of "$Id: fl_jpeg_image.cxx,v 1.5.2.3.2.3 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: fl_jpeg_image.cxx,v 1.5.2.3.2.2 2003/01/30 21:45:28 easysw Exp $". // diff -ur -- fltk-1.1.6/test/fonts.cxx fltk-utf8-1.1.6/test/fonts.cxx --- fltk-1.1.6/test/fonts.cxx 2004-09-09 01:55:41.000000000 +0100 +++ fltk-utf8-1.1.6/test/fonts.cxx 2005-06-12 19:06:32.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: fonts.cxx,v 1.5.2.3.2.5 2004/09/09 00:55:41 matthiaswm Exp $" +// "$Id: fonts.cxx,v 1.5.2.3.2.3 2003/01/30 21:45:29 easysw Exp $" // // Font demo program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -100,17 +100,19 @@ textobj->redraw(); } -char label[400]; +char label[0x1000]; void create_the_forms() { + int n = 0; form = new Fl_Window(550,370); strcpy(label, "Hello, world!\n"); int i = strlen(label); - uchar c; + ulong c; for (c = ' '+1; c < 127; c++) {if (!(c&0x1f)) label[i++]='\n'; label[i++]=c;} label[i++] = '\n'; - for (c = 0xA1; c; c++) {if (!(c&0x1f)) label[i++]='\n'; label[i++]=c;} + for (c = 0xA1; c < 0x600; c += 9) {if (!(++n&(0x1f))) label[i++]='\n'; + i += fl_ucs2utf((unsigned int)c, label + i);} label[i] = 0; textobj = new FontDisplay(FL_FRAME_BOX,10,10,530,170,label); @@ -133,12 +135,8 @@ int main(int argc, char **argv) { Fl::scheme(NULL); create_the_forms(); -#ifdef __APPLE__ - int i = 0; -#else int i = fl_choice("Which fonts:","-*","iso8859","All"); -#endif - int k = Fl::set_fonts(i ? (i>1 ? "*" : 0) : "-*"); + int k = (int)Fl::set_fonts(i ? (i>1 ? "*" : 0) : "-*"); for (i = 0; i < k; i++) { int t; const char *name = Fl::get_font_name((Fl_Font)i,&t); char buffer[128]; @@ -154,6 +152,7 @@ sprintf(buffer, "@F%d@.%s", i, name); name = buffer; #endif + free(malloc(5)); fontobj->add(name); int *s; int n = Fl::get_font_sizes((Fl_Font)i, s); numsizes[i] = n; @@ -169,5 +168,5 @@ } // -// End of "$Id: fonts.cxx,v 1.5.2.3.2.5 2004/09/09 00:55:41 matthiaswm Exp $". +// End of "$Id: fonts.cxx,v 1.5.2.3.2.3 2003/01/30 21:45:29 easysw Exp $". // diff -ur -- fltk-1.1.6/test/forms.cxx fltk-utf8-1.1.6/test/forms.cxx --- fltk-1.1.6/test/forms.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/forms.cxx 2005-06-12 19:06:32.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: forms.cxx,v 1.4.2.4.2.5 2004/04/11 04:39:01 easysw Exp $" +// "$Id: forms.cxx,v 1.4.2.4.2.4 2003/01/30 21:45:32 easysw Exp $" // // Another forms demo for the Fast Light Tool Kit (FLTK). // @@ -9,7 +9,7 @@ // This demo show the different boxtypes. Note that some // boxtypes are not appropriate for some objects // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -231,5 +231,5 @@ } // -// End of "$Id: forms.cxx,v 1.4.2.4.2.5 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: forms.cxx,v 1.4.2.4.2.4 2003/01/30 21:45:32 easysw Exp $". // diff -ur -- fltk-1.1.6/test/gl_overlay.cxx fltk-utf8-1.1.6/test/gl_overlay.cxx --- fltk-1.1.6/test/gl_overlay.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/gl_overlay.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: gl_overlay.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $" +// "$Id: gl_overlay.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:36 easysw Exp $" // // OpenGL overlay test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -151,5 +151,5 @@ } // -// End of "$Id: gl_overlay.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: gl_overlay.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:36 easysw Exp $". // diff -ur -- fltk-1.1.6/test/glpuzzle.cxx fltk-utf8-1.1.6/test/glpuzzle.cxx --- fltk-1.1.6/test/glpuzzle.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/glpuzzle.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -154,7 +154,7 @@ value = 0; for (i = 0; i < HEIGHT; i++) { for (j = 0; j < WIDTH; j++) { - value = value + convert[config[i][j]]; + value = value + convert[(int)config[i][j]]; value *= 6; } } @@ -521,8 +521,8 @@ for (i = 0; i < WIDTH; i++) { for (j = 0; j < HEIGHT; j++) { - if (convert[config[j][i]] != - convert[newpiece->pieces[j][i]]) + if (convert[(int)config[j][i]] != + convert[(int)newpiece->pieces[j][i]]) goto nomatch; } } diff -ur -- fltk-1.1.6/test/hello.cxx fltk-utf8-1.1.6/test/hello.cxx --- fltk-1.1.6/test/hello.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/hello.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: hello.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $" +// "$Id: hello.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:40 easysw Exp $" // // Hello, World! program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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,6 +26,7 @@ #include #include #include +#include int main(int argc, char **argv) { Fl_Window *window = new Fl_Window(300,180); @@ -34,10 +35,11 @@ box->labelsize(36); box->labeltype(FL_SHADOW_LABEL); window->end(); + window->show(argc, argv); return Fl::run(); } // -// End of "$Id: hello.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: hello.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:40 easysw Exp $". // diff -ur -- fltk-1.1.6/test/help.cxx fltk-utf8-1.1.6/test/help.cxx --- fltk-1.1.6/test/help.cxx 2004-07-26 21:52:52.000000000 +0100 +++ fltk-utf8-1.1.6/test/help.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: help.cxx,v 1.1.2.11 2004/07/26 20:52:52 easysw Exp $" +// "$Id: help.cxx,v 1.1.2.9 2003/01/30 21:45:41 easysw Exp $" // // Fl_Help_Dialog test program. // -// Copyright 1999-2004 by Easy Software Products. +// Copyright 1999-2003 by Easy Software Products. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -52,7 +52,7 @@ else help->load(argv[1]); - help->show(1, argv); + help->show(argc, argv); Fl::run(); @@ -63,5 +63,5 @@ // -// End of "$Id: help.cxx,v 1.1.2.11 2004/07/26 20:52:52 easysw Exp $". +// End of "$Id: help.cxx,v 1.1.2.9 2003/01/30 21:45:41 easysw Exp $". // diff -ur -- fltk-1.1.6/test/iconize.cxx fltk-utf8-1.1.6/test/iconize.cxx --- fltk-1.1.6/test/iconize.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/iconize.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: iconize.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $" +// "$Id: iconize.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:43 easysw Exp $" // // Iconize test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -77,5 +77,5 @@ } // -// End of "$Id: iconize.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: iconize.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:43 easysw Exp $". // diff -ur -- fltk-1.1.6/test/image.cxx fltk-utf8-1.1.6/test/image.cxx --- fltk-1.1.6/test/image.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/image.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: image.cxx,v 1.6.2.3.2.9 2004/04/11 04:39:01 easysw Exp $" +// "$Id: image.cxx,v 1.6.2.3.2.8 2003/01/30 21:45:44 easysw Exp $" // // Fl_Image test program for the Fast Light Tool Kit (FLTK). // @@ -7,7 +7,7 @@ // as an icon or postage stamp. Use fl_draw_image to go directly // from an buffered image that changes often. // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -80,7 +80,7 @@ } #include -#if !defined(WIN32) && !defined(__APPLE__) +#if !defined(WIN32) && !defined(__APPLE__) && !NANO_X #include "list_visuals.cxx" #endif @@ -96,7 +96,7 @@ } int main(int argc, char **argv) { -#if !defined(WIN32) && !defined(__APPLE__) +#if !defined(WIN32) && !defined(__APPLE__) && !NANO_X int i = 1; Fl::args(argc,argv,i,arg); @@ -155,5 +155,5 @@ } // -// End of "$Id: image.cxx,v 1.6.2.3.2.9 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: image.cxx,v 1.6.2.3.2.8 2003/01/30 21:45:44 easysw Exp $". // Only in fltk-utf8-1.1.6/test: inactive.cxx Only in fltk-utf8-1.1.6/test: inactive.h diff -ur -- fltk-1.1.6/test/input.cxx fltk-utf8-1.1.6/test/input.cxx --- fltk-1.1.6/test/input.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/input.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: input.cxx,v 1.5.2.4.2.7 2004/04/11 04:39:01 easysw Exp $" +// "$Id: input.cxx,v 1.5.2.4.2.6 2003/06/05 21:14:19 easysw Exp $" // // Input field test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -59,7 +59,8 @@ void color_cb(Fl_Widget* button, void* v) { Fl_Color c; - switch ((int)v) { + long val = (long)v; + switch ((int)val) { case 0: c = FL_WHITE; break; case 1: c = FL_SELECTION_COLOR; break; default: c = FL_BLACK; break; @@ -132,5 +133,5 @@ } // -// End of "$Id: input.cxx,v 1.5.2.4.2.7 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: input.cxx,v 1.5.2.4.2.6 2003/06/05 21:14:19 easysw Exp $". // diff -ur -- fltk-1.1.6/test/keyboard.cxx fltk-utf8-1.1.6/test/keyboard.cxx --- fltk-1.1.6/test/keyboard.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/keyboard.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: keyboard.cxx,v 1.5.2.3.2.7 2004/04/11 04:39:01 easysw Exp $" +// "$Id: keyboard.cxx,v 1.5.2.3.2.6 2003/01/30 21:45:46 easysw Exp $" // // Keyboard/event test program for the Fast Light Tool Kit (FLTK). // @@ -17,7 +17,7 @@ // // On IRIX the backslash key does not work. A bug in XKeysymToKeycode? // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -103,11 +103,11 @@ for (int i = 0; i < window->children(); i++) { Fl_Widget* b = window->child(i); if (b->callback() == (Fl_Callback*)key_cb) { - int i = int(b->user_data()); + long i = (long)b->user_data(); if (!i) i = b->label()[0]; ((Fl_Button*)b)->value(Fl::event_key(i)); } else if (b->callback() == (Fl_Callback*)shift_cb) { - int i = int(b->user_data()); + long i = (long)b->user_data(); ((Fl_Button*)b)->value(Fl::event_state(i)); } } @@ -139,5 +139,5 @@ } // -// End of "$Id: keyboard.cxx,v 1.5.2.3.2.7 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: keyboard.cxx,v 1.5.2.3.2.6 2003/01/30 21:45:46 easysw Exp $". // Only in fltk-utf8-1.1.6/test: keyboard_ui.cxx Only in fltk-utf8-1.1.6/test: keyboard_ui.h diff -ur -- fltk-1.1.6/test/label.cxx fltk-utf8-1.1.6/test/label.cxx --- fltk-1.1.6/test/label.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/label.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: label.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $" +// "$Id: label.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:48 easysw Exp $" // // Label test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -156,5 +156,5 @@ } // -// End of "$Id: label.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: label.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:48 easysw Exp $". // diff -ur -- fltk-1.1.6/test/line_style.cxx fltk-utf8-1.1.6/test/line_style.cxx --- fltk-1.1.6/test/line_style.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/line_style.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: line_style.cxx,v 1.1.2.2.2.3 2004/04/11 04:39:01 easysw Exp $" +// "$Id: line_style.cxx,v 1.1.2.2.2.2 2003/01/30 21:45:49 easysw Exp $" // // Line style demo for the Fast Light Tool Kit (FLTK). // -// Copyright 2000-2004 by Bill Spitzak and others. +// Copyright 2000-2003 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 @@ -52,9 +52,9 @@ buf[3] = char(sliders[7]->value()); buf[4] = 0; fl_line_style( - (int)(choice[0]->mvalue()->user_data()) + - (int)(choice[1]->mvalue()->user_data()) + - (int)(choice[2]->mvalue()->user_data()), + (long)choice[0]->mvalue()->user_data() + + (long)choice[1]->mvalue()->user_data() + + (long)choice[2]->mvalue()->user_data(), (int)(sliders[3]->value()), buf); fl_rect(10,10,w()-20,h()-20); @@ -148,5 +148,5 @@ // -// End of "$Id: line_style.cxx,v 1.1.2.2.2.3 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: line_style.cxx,v 1.1.2.2.2.2 2003/01/30 21:45:49 easysw Exp $". // diff -ur -- fltk-1.1.6/test/list_visuals.cxx fltk-utf8-1.1.6/test/list_visuals.cxx --- fltk-1.1.6/test/list_visuals.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/list_visuals.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: list_visuals.cxx,v 1.5.2.3.2.4 2004/04/11 04:39:01 easysw Exp $" +// "$Id: list_visuals.cxx,v 1.5.2.3.2.3 2003/01/30 21:45:49 easysw Exp $" // // Visual list utility for the Fast Light Tool Kit (FLTK). // @@ -11,7 +11,7 @@ // This file may be #included in another program to make a function to // call to list the visuals. Fl.H must be included first to indicate this. // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -31,7 +31,7 @@ // Please report all bugs and problems to "fltk-bugs@fltk.org". // -#if defined(WIN32) || defined(__APPLE__) +#if defined(WIN32) || defined(__MACOS__) || NANO_X #include #include @@ -235,5 +235,5 @@ #endif // -// End of "$Id: list_visuals.cxx,v 1.5.2.3.2.4 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: list_visuals.cxx,v 1.5.2.3.2.3 2003/01/30 21:45:49 easysw Exp $". // Only in fltk-utf8-1.1.6/test: lowlevel.cxx diff -ur -- fltk-1.1.6/test/mandelbrot.cxx fltk-utf8-1.1.6/test/mandelbrot.cxx --- fltk-1.1.6/test/mandelbrot.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/mandelbrot.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: mandelbrot.cxx,v 1.8.2.4.2.4 2004/04/11 04:39:01 easysw Exp $" +// "$Id: mandelbrot.cxx,v 1.8.2.4.2.3 2003/01/30 21:45:50 easysw Exp $" // // Mandelbrot set demo for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -197,5 +197,5 @@ } // -// End of "$Id: mandelbrot.cxx,v 1.8.2.4.2.4 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: mandelbrot.cxx,v 1.8.2.4.2.3 2003/01/30 21:45:50 easysw Exp $". // Only in fltk-utf8-1.1.6/test: mandelbrot_ui.cxx Only in fltk-utf8-1.1.6/test: mandelbrot_ui.h diff -ur -- fltk-1.1.6/test/menubar.cxx fltk-utf8-1.1.6/test/menubar.cxx --- fltk-1.1.6/test/menubar.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/menubar.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: menubar.cxx,v 1.6.2.8.2.7 2004/04/11 04:39:01 easysw Exp $" +// "$Id: menubar.cxx,v 1.6.2.8.2.6 2003/01/30 21:45:53 easysw Exp $" // // Menubar test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -203,5 +203,5 @@ } // -// End of "$Id: menubar.cxx,v 1.6.2.8.2.7 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: menubar.cxx,v 1.6.2.8.2.6 2003/01/30 21:45:53 easysw Exp $". // diff -ur -- fltk-1.1.6/test/message.cxx fltk-utf8-1.1.6/test/message.cxx --- fltk-1.1.6/test/message.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/message.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: message.cxx,v 1.5.2.3.2.6 2004/04/11 04:39:01 easysw Exp $" +// "$Id: message.cxx,v 1.5.2.3.2.5 2003/01/30 21:45:55 easysw Exp $" // // Message test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -55,5 +55,5 @@ } // -// End of "$Id: message.cxx,v 1.5.2.3.2.6 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: message.cxx,v 1.5.2.3.2.5 2003/01/30 21:45:55 easysw Exp $". // diff -ur -- fltk-1.1.6/test/minimum.cxx fltk-utf8-1.1.6/test/minimum.cxx --- fltk-1.1.6/test/minimum.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/minimum.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: minimum.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $" +// "$Id: minimum.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:56 easysw Exp $" // // Minimal update test program for the Fast Light Tool Kit (FLTK). // @@ -20,7 +20,7 @@ // machine is, this is an insane waste of resources, and should be // stopped! // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -74,5 +74,5 @@ } // -// End of "$Id: minimum.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: minimum.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:56 easysw Exp $". // diff -ur -- fltk-1.1.6/test/navigation.cxx fltk-utf8-1.1.6/test/navigation.cxx --- fltk-1.1.6/test/navigation.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/navigation.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,12 +1,12 @@ // -// "$Id: navigation.cxx,v 1.5.2.3.2.4 2004/04/11 04:39:01 easysw Exp $" +// "$Id: navigation.cxx,v 1.5.2.3.2.3 2003/01/30 21:45:57 easysw Exp $" // // Navigation test program for the Fast Light Tool Kit (FLTK). // // Silly test of navigation keys. This is not a recommended method of // laying out your panels! // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -66,5 +66,5 @@ } // -// End of "$Id: navigation.cxx,v 1.5.2.3.2.4 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: navigation.cxx,v 1.5.2.3.2.3 2003/01/30 21:45:57 easysw Exp $". // Only in fltk-utf8-1.1.6/test: offscreen.cxx diff -ur -- fltk-1.1.6/test/output.cxx fltk-utf8-1.1.6/test/output.cxx --- fltk-1.1.6/test/output.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/output.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: output.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:01 easysw Exp $" +// "$Id: output.cxx,v 1.4.2.3.2.3 2003/01/30 21:45:58 easysw Exp $" // // Output test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -99,5 +99,5 @@ } // -// End of "$Id: output.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: output.cxx,v 1.4.2.3.2.3 2003/01/30 21:45:58 easysw Exp $". // diff -ur -- fltk-1.1.6/test/overlay.cxx fltk-utf8-1.1.6/test/overlay.cxx --- fltk-1.1.6/test/overlay.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/overlay.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: overlay.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $" +// "$Id: overlay.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:59 easysw Exp $" // // Overlay window test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -80,5 +80,5 @@ } // -// End of "$Id: overlay.cxx,v 1.4.2.3.2.3 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: overlay.cxx,v 1.4.2.3.2.2 2003/01/30 21:45:59 easysw Exp $". // diff -ur -- fltk-1.1.6/test/pack.cxx fltk-utf8-1.1.6/test/pack.cxx --- fltk-1.1.6/test/pack.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/pack.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: pack.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:01 easysw Exp $" +// "$Id: pack.cxx,v 1.4.2.3.2.3 2003/01/30 21:45:59 easysw Exp $" // // Fl_Pack test program for the Fast Light Tool Kit (FLTK). // @@ -7,7 +7,7 @@ // Changing the type() of an Fl_Pack after it is displayed is not supported // so I have to do a lot of resizing of things before that. // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -114,5 +114,5 @@ } // -// End of "$Id: pack.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: pack.cxx,v 1.4.2.3.2.3 2003/01/30 21:45:59 easysw Exp $". // diff -ur -- fltk-1.1.6/test/pixmap.cxx fltk-utf8-1.1.6/test/pixmap.cxx --- fltk-1.1.6/test/pixmap.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/pixmap.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: pixmap.cxx,v 1.4.2.3.2.5 2004/04/11 04:39:01 easysw Exp $" +// "$Id: pixmap.cxx,v 1.4.2.3.2.4 2003/01/30 21:45:59 easysw Exp $" // // Pixmap label test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -96,5 +96,5 @@ } // -// End of "$Id: pixmap.cxx,v 1.4.2.3.2.5 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: pixmap.cxx,v 1.4.2.3.2.4 2003/01/30 21:45:59 easysw Exp $". // diff -ur -- fltk-1.1.6/test/pixmap_browser.cxx fltk-utf8-1.1.6/test/pixmap_browser.cxx --- fltk-1.1.6/test/pixmap_browser.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/pixmap_browser.cxx 2005-06-12 19:06:33.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: pixmap_browser.cxx,v 1.5.2.4.2.9 2004/04/11 04:39:01 easysw Exp $" +// "$Id: pixmap_browser.cxx,v 1.5.2.4.2.8 2003/01/30 21:46:00 easysw Exp $" // // A shared image test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -101,5 +101,5 @@ } // -// End of "$Id: pixmap_browser.cxx,v 1.5.2.4.2.9 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: pixmap_browser.cxx,v 1.5.2.4.2.8 2003/01/30 21:46:00 easysw Exp $". // Only in fltk-utf8-1.1.6/test: preferences.cxx Only in fltk-utf8-1.1.6/test: preferences.h Only in fltk-utf8-1.1.6/test: radio.cxx Only in fltk-utf8-1.1.6/test: radio.h Only in fltk-utf8-1.1.6/test: readimg.cxx Only in fltk-utf8-1.1.6/test: resize.cxx Only in fltk-utf8-1.1.6/test: resize.h diff -ur -- fltk-1.1.6/test/resizebox.cxx fltk-utf8-1.1.6/test/resizebox.cxx --- fltk-1.1.6/test/resizebox.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/resizebox.cxx 2005-06-12 19:06:34.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: resizebox.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:01 easysw Exp $" +// "$Id: resizebox.cxx,v 1.4.2.3.2.3 2003/01/30 21:46:00 easysw Exp $" // // Resize box test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -96,5 +96,5 @@ } // -// End of "$Id: resizebox.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: resizebox.cxx,v 1.4.2.3.2.3 2003/01/30 21:46:00 easysw Exp $". // Only in fltk-utf8-1.1.6/test: scribble.cxx diff -ur -- fltk-1.1.6/test/shape.cxx fltk-utf8-1.1.6/test/shape.cxx --- fltk-1.1.6/test/shape.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/shape.cxx 2005-06-12 19:06:34.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: shape.cxx,v 1.5.2.4.2.3 2004/04/11 04:39:01 easysw Exp $" +// "$Id: shape.cxx,v 1.5.2.4.2.2 2003/01/30 21:46:02 easysw Exp $" // // Tiny OpenGL demo program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -111,5 +111,5 @@ } // -// End of "$Id: shape.cxx,v 1.5.2.4.2.3 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: shape.cxx,v 1.5.2.4.2.2 2003/01/30 21:46:02 easysw Exp $". // diff -ur -- fltk-1.1.6/test/subwindow.cxx fltk-utf8-1.1.6/test/subwindow.cxx --- fltk-1.1.6/test/subwindow.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/subwindow.cxx 2005-06-12 19:06:34.000000000 +0100 @@ -1,5 +1,5 @@ // -// "$Id: subwindow.cxx,v 1.5.2.5.2.4 2004/04/11 04:39:01 easysw Exp $" +// "$Id: subwindow.cxx,v 1.5.2.5.2.3 2003/01/30 21:46:03 easysw Exp $" // // Nested window test program for the Fast Light Tool Kit (FLTK). // @@ -8,7 +8,7 @@ // Buttons and pop-up menu should work, indicating that mouse positions // are being correctly translated. // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -183,5 +183,5 @@ } // -// End of "$Id: subwindow.cxx,v 1.5.2.5.2.4 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: subwindow.cxx,v 1.5.2.5.2.3 2003/01/30 21:46:03 easysw Exp $". // diff -ur -- fltk-1.1.6/test/symbols.cxx fltk-utf8-1.1.6/test/symbols.cxx --- fltk-1.1.6/test/symbols.cxx 2004-08-09 22:05:45.000000000 +0100 +++ fltk-utf8-1.1.6/test/symbols.cxx 2005-06-12 19:06:34.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: symbols.cxx,v 1.4.2.3.2.8 2004/08/09 21:05:45 matthiaswm Exp $" +// "$Id: symbols.cxx,v 1.4.2.3.2.5 2003/01/30 21:46:03 easysw Exp $" // // Symbol test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -36,40 +36,34 @@ int N = 0; #define W 70 #define H 70 -#define ROWS 7 -#define COLS 4 +#define ROWS 5 +#define COLS 5 Fl_Window *window; -Fl_Value_Slider *orientation; -Fl_Value_Slider *size; void slider_cb(Fl_Widget *w, void *) { static char buf[80]; - int val = (int)orientation->value(); - int sze = (int)size->value(); - for (int i = window->children(); i--; ) { // all window children - Fl_Widget *wc = window->child(i); + int val = (int)(((Fl_Value_Slider*)w)->value()); + Fl_Window *win = (Fl_Window*)w->parent(); // get parent window + for (int i = win->children(); i--; ) { // all window children + Fl_Widget *wc = win->child(i); const char *l = wc->label(); if ( *l == '@' ) { // all children with '@' if ( *(++l) == '@' ) { // ascii legend? l++; - while (isdigit(*l)||(*l=='+'&&l[1])||*l=='-') { l++; } - if (val&&sze) sprintf(buf, "@@%+d%d%s", sze, val, l); - else if (val) sprintf(buf, "@@%d%s", val, l); - else if (sze) sprintf(buf, "@@%+d%s", sze, l); - else sprintf(buf, "@@%s", l); + while (isdigit(*l)) { l++; } + if (val == 0) { sprintf(buf, "@@%s", l); } + else { sprintf(buf, "@@%d%s", val, l); } } else { // box with symbol - while (isdigit(*l)||(*l=='+'&&l[1])||*l=='-') { l++; } - if (val&&sze) sprintf(buf, "@%+d%d%s", sze, val, l); - else if (val) sprintf(buf, "@%d%s", val, l); - else if (sze) sprintf(buf, "@%+d%s", sze, l); - else sprintf(buf, "@%s", l); + while (isdigit(*l)) { l++; } + if (val == 0) { sprintf(buf, "@%s", l); } + else { sprintf(buf, "@%d%s", val, l); } } free((void*)(wc->label())); wc->label(strdup(buf)); } } - window->redraw(); + win->redraw(); } void bt(const char *name) { @@ -88,6 +82,7 @@ } int main(int argc, char ** argv) { + Fl::symbol_in_label(1); window = new Fl_Single_Window(COLS*W,ROWS*H+60); bt("@->"); bt("@>"); @@ -114,26 +109,17 @@ bt("@menu"); bt("@UpArrow"); bt("@DnArrow"); -bt("@search"); -bt("@FLTK"); - orientation = new Fl_Value_Slider( - (int)(window->w()*.05+.5), window->h()-40, - (int)(window->w()*.42+.5), 16, "Orientation"); - orientation->type(FL_HORIZONTAL); - orientation->range(0.0, 9.0); - orientation->value(0.0); - orientation->step(1); - orientation->callback(slider_cb, 0); - - size = new Fl_Value_Slider( - (int)(window->w()*.53+.5), window->h()-40, - (int)(window->w()*.42+.5), 16, "Size"); - size->type(FL_HORIZONTAL); - size->range(-3.0, 9.0); - size->value(0.0); - size->step(1); - size->callback(slider_cb, 0); + Fl_Value_Slider slider((int)(window->w()*.10+.5), + window->h()-40, + (int)(window->w()*.80+.5), + 16, + "Orientation"); + slider.type(FL_HORIZONTAL); + slider.range(0.0, 9.0); + slider.value(0.0); + slider.step(1); + slider.callback(slider_cb, &slider); window->resizable(window); window->show(argc,argv); @@ -141,5 +127,5 @@ } // -// End of "$Id: symbols.cxx,v 1.4.2.3.2.8 2004/08/09 21:05:45 matthiaswm Exp $". +// End of "$Id: symbols.cxx,v 1.4.2.3.2.5 2003/01/30 21:46:03 easysw Exp $". // Only in fltk-utf8-1.1.6/test: table.cxx Only in fltk-utf8-1.1.6/test: tabs.cxx Only in fltk-utf8-1.1.6/test: tabs.h Only in fltk-utf8-1.1.6/test: testtable.cxx diff -ur -- fltk-1.1.6/test/threads.cxx fltk-utf8-1.1.6/test/threads.cxx --- fltk-1.1.6/test/threads.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/threads.cxx 2005-06-12 19:06:34.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: threads.cxx,v 1.10.2.6 2004/04/11 04:39:01 easysw Exp $" +// "$Id: threads.cxx,v 1.10.2.4 2003/01/30 21:46:04 easysw Exp $" // // Threading example program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -126,5 +126,5 @@ // -// End of "$Id: threads.cxx,v 1.10.2.6 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: threads.cxx,v 1.10.2.4 2003/01/30 21:46:04 easysw Exp $". // diff -ur -- fltk-1.1.6/test/tile.cxx fltk-utf8-1.1.6/test/tile.cxx --- fltk-1.1.6/test/tile.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/tile.cxx 2005-06-12 19:06:34.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: tile.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:01 easysw Exp $" +// "$Id: tile.cxx,v 1.4.2.3.2.3 2003/01/30 21:46:06 easysw Exp $" // // Tile test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -86,5 +86,5 @@ } // -// End of "$Id: tile.cxx,v 1.4.2.3.2.4 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: tile.cxx,v 1.4.2.3.2.3 2003/01/30 21:46:06 easysw Exp $". // diff -ur -- fltk-1.1.6/test/tiled_image.cxx fltk-utf8-1.1.6/test/tiled_image.cxx --- fltk-1.1.6/test/tiled_image.cxx 2004-04-11 05:39:01.000000000 +0100 +++ fltk-utf8-1.1.6/test/tiled_image.cxx 2005-06-12 19:06:34.000000000 +0100 @@ -1,9 +1,9 @@ // -// "$Id: tiled_image.cxx,v 1.1.2.7 2004/04/11 04:39:01 easysw Exp $" +// "$Id: tiled_image.cxx,v 1.1.2.6 2003/01/30 21:46:06 easysw Exp $" // // Fl_Tiled_Image test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2004 by Bill Spitzak and others. +// Copyright 1998-2003 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 @@ -42,7 +42,7 @@ } #include -#if !defined(WIN32) && !defined(__APPLE__) +#if !defined(WIN32) && !defined(__APPLE__) && !NANO_X #include "list_visuals.cxx" #endif @@ -58,7 +58,7 @@ } int main(int argc, char **argv) { -#if !defined(WIN32) && !defined(__APPLE__) +#if !defined(WIN32) && !defined(__APPLE__) && !NANO_X int i = 1; Fl::args(argc,argv,i,arg); @@ -100,5 +100,5 @@ } // -// End of "$Id: tiled_image.cxx,v 1.1.2.7 2004/04/11 04:39:01 easysw Exp $". +// End of "$Id: tiled_image.cxx,v 1.1.2.6 2003/01/30 21:46:06 easysw Exp $". // Only in fltk-utf8-1.1.6/test: tree.cxx Only in fltk-utf8-1.1.6/test: utf8.cxx Only in fltk-utf8-1.1.6/test: valuators.cxx Only in fltk-utf8-1.1.6/test: valuators.h diff -ur -- fltk-1.1.6/vcnet/CubeView.vcproj fltk-utf8-1.1.6/vcnet/CubeView.vcproj --- fltk-1.1.6/vcnet/CubeView.vcproj 2004-09-15 14:38:02.000000000 +0100 +++ fltk-utf8-1.1.6/vcnet/CubeView.vcproj 2005-06-12 19:06:34.000000000 +0100 @@ -35,7 +35,7 @@ Name="VCCustomBuildTool"/> @@ -86,7 +86,7 @@ Name="VCCustomBuildTool"/> diff -ur -- fltk-1.1.6/vcnet/keyboard.vcproj fltk-utf8-1.1.6/vcnet/keyboard.vcproj --- fltk-1.1.6/vcnet/keyboard.vcproj 2004-09-15 14:38:02.000000000 +0100 +++ fltk-utf8-1.1.6/vcnet/keyboard.vcproj 2005-06-12 19:06:35.000000000 +0100 @@ -36,7 +36,7 @@ Name="VCCustomBuildTool"/> @@ -86,7 +86,7 @@ Name="VCCustomBuildTool"/> diff -ur -- fltk-1.1.6/vcnet/line_style.vcproj fltk-utf8-1.1.6/vcnet/line_style.vcproj --- fltk-1.1.6/vcnet/line_style.vcproj 2004-09-15 14:38:03.000000000 +0100 +++ fltk-utf8-1.1.6/vcnet/line_style.vcproj 2005-06-12 19:06:35.000000000 +0100 @@ -36,7 +36,7 @@ Name="VCCustomBuildTool"/> @@ -85,7 +85,7 @@ Name="VCCustomBuildTool"/> diff -ur -- fltk-1.1.6/visualc/CubeView.dsp fltk-utf8-1.1.6/visualc/CubeView.dsp --- fltk-1.1.6/visualc/CubeView.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/CubeView.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 opengl32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/CubeView.exe" /libpath:"..\lib" +# ADD LINK32 Imm32.lib opengl32.lib comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/CubeView.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "CubeView - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/CubeViewd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 Imm32.lib opengl32.lib comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/CubeViewd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/adjuster.dsp fltk-utf8-1.1.6/visualc/adjuster.dsp --- fltk-1.1.6/visualc/adjuster.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/adjuster.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/adjuster.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/adjuster.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "adjuster - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/adjusterd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/adjusterd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/arc.dsp fltk-utf8-1.1.6/visualc/arc.dsp --- fltk-1.1.6/visualc/arc.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/arc.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/arc.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/arc.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "arc - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/arcd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/arcd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/ask.dsp fltk-utf8-1.1.6/visualc/ask.dsp --- fltk-1.1.6/visualc/ask.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/ask.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/ask.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/ask.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "ask - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/askd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/askd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/bitmap.dsp fltk-utf8-1.1.6/visualc/bitmap.dsp --- fltk-1.1.6/visualc/bitmap.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/bitmap.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/bitmap.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/bitmap.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "bitmap - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/bitmapd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/bitmapd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/boxtype.dsp fltk-utf8-1.1.6/visualc/boxtype.dsp --- fltk-1.1.6/visualc/boxtype.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/boxtype.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/boxtype.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/boxtype.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "boxtype - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/boxtyped.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/boxtyped.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/browser.dsp fltk-utf8-1.1.6/visualc/browser.dsp --- fltk-1.1.6/visualc/browser.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/browser.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/browser.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/browser.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "browser - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/browserd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/browserd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/button.dsp fltk-utf8-1.1.6/visualc/button.dsp --- fltk-1.1.6/visualc/button.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/button.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/button.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/button.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "button - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/buttond.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/buttond.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/buttons.dsp fltk-utf8-1.1.6/visualc/buttons.dsp --- fltk-1.1.6/visualc/buttons.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/buttons.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/buttons.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/buttons.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "buttons - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/buttonsd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/buttonsd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF Only in fltk-utf8-1.1.6/visualc: change.sh diff -ur -- fltk-1.1.6/visualc/checkers.dsp fltk-utf8-1.1.6/visualc/checkers.dsp --- fltk-1.1.6/visualc/checkers.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/checkers.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/checkers.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/checkers.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "checkers - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/checkersd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/checkersd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/clock.dsp fltk-utf8-1.1.6/visualc/clock.dsp --- fltk-1.1.6/visualc/clock.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/clock.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/clock.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/clock.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "clock - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/clockd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/clockd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/colbrowser.dsp fltk-utf8-1.1.6/visualc/colbrowser.dsp --- fltk-1.1.6/visualc/colbrowser.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/colbrowser.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/colbrowser.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/colbrowser.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "colbrowser - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/colbrowserd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/colbrowserd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/color_chooser.dsp fltk-utf8-1.1.6/visualc/color_chooser.dsp --- fltk-1.1.6/visualc/color_chooser.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/color_chooser.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /machine:I386 /nodefaultlib:"libcd" /out:"../test/color_chooser.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /machine:I386 /nodefaultlib:"libcd" /out:"../test/color_chooser.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "color_chooser - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/color_chooserd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/color_chooserd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/cursor.dsp fltk-utf8-1.1.6/visualc/cursor.dsp --- fltk-1.1.6/visualc/cursor.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/cursor.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/cursor.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/cursor.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "cursor - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/cursord.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/cursord.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/curve.dsp fltk-utf8-1.1.6/visualc/curve.dsp --- fltk-1.1.6/visualc/curve.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/curve.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/curve.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/curve.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "curve - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/curved.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/curved.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/demo.dsp fltk-utf8-1.1.6/visualc/demo.dsp --- fltk-1.1.6/visualc/demo.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/demo.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/demo.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/demo.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "demo - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/demod.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/demod.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF Only in fltk-utf8-1.1.6/visualc: dnd.dsp diff -ur -- fltk-1.1.6/visualc/doublebuffer.dsp fltk-utf8-1.1.6/visualc/doublebuffer.dsp --- fltk-1.1.6/visualc/doublebuffer.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/doublebuffer.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/doublebuffer.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/doublebuffer.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "doublebuffer - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/doublebufferd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/doublebufferd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/editor.dsp fltk-utf8-1.1.6/visualc/editor.dsp --- fltk-1.1.6/visualc/editor.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/editor.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /entry:"mainCRTStartup" /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/editor.exe" /libpath:"..\lib" +# ADD LINK32 Imm32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /entry:"mainCRTStartup" /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/editor.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "editor - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /entry:"mainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/editord.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 Imm32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /entry:"mainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/editord.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/fast_slow.dsp fltk-utf8-1.1.6/visualc/fast_slow.dsp --- fltk-1.1.6/visualc/fast_slow.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/fast_slow.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/fast_slow.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/fast_slow.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "fast_slow - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/fast_slowd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/fast_slowd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/file_chooser.dsp fltk-utf8-1.1.6/visualc/file_chooser.dsp --- fltk-1.1.6/visualc/file_chooser.dsp 2004-11-20 03:44:18.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/file_chooser.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/file_chooser.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib Imm32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/file_chooser.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "file_chooser - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/file_chooserd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib Imm32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/file_chooserd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF Only in fltk-1.1.6/visualc: fltk.dsw Only in fltk-1.1.6/visualc: fltk.lib.dsp Only in fltk-1.1.6/visualc: fltkdll.dsp Only in fltk-1.1.6/visualc: fltkforms.dsp Only in fltk-1.1.6/visualc: fltkgl.dsp diff -ur -- fltk-1.1.6/visualc/fltkimages.dsp fltk-utf8-1.1.6/visualc/fltkimages.dsp --- fltk-1.1.6/visualc/fltkimages.dsp 2004-10-19 19:21:55.000000000 +0100 +++ fltk-utf8-1.1.6/visualc/fltkimages.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="fltkimages" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="fltkutf8images" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=fltkimages - Win32 Debug +CFG=fltkutf8images - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "fltkimages.mak". +!MESSAGE NMAKE /f "fltkutf8images.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "fltkimages.mak" CFG="fltkimages - Win32 Debug" +!MESSAGE NMAKE /f "fltkutf8images.mak" CFG="fltkimages - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "fltkimages - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "fltkimages - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "fltkutf8images - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "fltkutf8images - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "fltkimages - Win32 Release" +!IF "$(CFG)" == "fltkutf8images - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -50,9 +50,9 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\lib\fltkimages.lib" +# ADD LIB32 /nologo /out:"..\lib\fltkutf8images.lib" -!ELSEIF "$(CFG)" == "fltkimages - Win32 Debug" +!ELSEIF "$(CFG)" == "fltkutf8images - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -73,14 +73,14 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\lib\fltkimagesd.lib" +# ADD LIB32 /nologo /out:"..\lib\fltkutf8imagesd.lib" !ENDIF # Begin Target -# Name "fltkimages - Win32 Release" -# Name "fltkimages - Win32 Debug" +# Name "fltkutf8images - Win32 Release" +# Name "fltkutf8images - Win32 Debug" # Begin Source File SOURCE=..\src\Fl_BMP_Image.cxx Only in fltk-utf8-1.1.6/visualc: fltkutf8.dsw Only in fltk-utf8-1.1.6/visualc: fltkutf8.lib.dsp Only in fltk-utf8-1.1.6/visualc: fltkutf8.lib.dsw Only in fltk-utf8-1.1.6/visualc: fltkutf8dll.dsp Only in fltk-utf8-1.1.6/visualc: fltkutf8forms.dsp Only in fltk-utf8-1.1.6/visualc: fltkutf8gl.dsp diff -ur -- fltk-1.1.6/visualc/fluid.dsp fltk-utf8-1.1.6/visualc/fluid.dsp --- fltk-1.1.6/visualc/fluid.dsp 2004-11-20 03:44:18.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/fluid.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../fluid/fluid.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib Imm32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../fluid/fluid.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "fluid - Win32 Debug" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../fluid/fluidd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib Imm32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../fluid/fluidd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/fonts.dsp fltk-utf8-1.1.6/visualc/fonts.dsp --- fltk-1.1.6/visualc/fonts.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/fonts.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/fonts.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/fonts.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "fonts - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/fontsd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/fontsd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/forms.dsp fltk-utf8-1.1.6/visualc/forms.dsp --- fltk-1.1.6/visualc/forms.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/forms.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/forms.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/forms.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "forms - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/formsd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/formsd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/fullscreen.dsp fltk-utf8-1.1.6/visualc/fullscreen.dsp --- fltk-1.1.6/visualc/fullscreen.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/fullscreen.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 opengl32.lib glu32.lib fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/fullscreen.exe" /libpath:"..\lib" +# ADD LINK32 opengl32.lib glu32.lib fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/fullscreen.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "fullscreen - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib glu32.lib fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/fullscreend.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 opengl32.lib glu32.lib fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/fullscreend.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/hello.dsp fltk-utf8-1.1.6/visualc/hello.dsp --- fltk-1.1.6/visualc/hello.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/hello.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/hello.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/hello.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "hello - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/hellod.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/hellod.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/help.dsp fltk-utf8-1.1.6/visualc/help.dsp --- fltk-1.1.6/visualc/help.dsp 2004-11-20 03:44:18.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/help.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/help.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/help.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "help - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/helpd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/helpd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/iconize.dsp fltk-utf8-1.1.6/visualc/iconize.dsp --- fltk-1.1.6/visualc/iconize.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/iconize.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/iconize.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/iconize.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "iconize - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/iconized.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/iconized.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/image.dsp fltk-utf8-1.1.6/visualc/image.dsp --- fltk-1.1.6/visualc/image.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/image.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/image.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/image.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "image - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/imaged.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/imaged.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/inactive.dsp fltk-utf8-1.1.6/visualc/inactive.dsp --- fltk-1.1.6/visualc/inactive.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/inactive.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/inactive.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/inactive.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "inactive - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/inactived.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/inactived.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/input.dsp fltk-utf8-1.1.6/visualc/input.dsp --- fltk-1.1.6/visualc/input.dsp 2002-01-09 15:23:10.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/input.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/input.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/input.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "input - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/inputd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/inputd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/jpeg.dsp fltk-utf8-1.1.6/visualc/jpeg.dsp --- fltk-1.1.6/visualc/jpeg.dsp 2004-10-19 19:21:55.000000000 +0100 +++ fltk-utf8-1.1.6/visualc/jpeg.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\lib\fltkjpeg.lib" +# ADD LIB32 /nologo /out:"..\lib\fltkutf8jpeg.lib" !ELSEIF "$(CFG)" == "jpeg - Win32 Debug" @@ -73,7 +73,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\lib\fltkjpegd.lib" +# ADD LIB32 /nologo /out:"..\lib\fltkutf8jpegd.lib" !ENDIF diff -ur -- fltk-1.1.6/visualc/keyboard.dsp fltk-utf8-1.1.6/visualc/keyboard.dsp --- fltk-1.1.6/visualc/keyboard.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/keyboard.dsp 2005-06-12 19:06:35.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/keyboard.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/keyboard.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "keyboard - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/keyboardd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/keyboardd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/label.dsp fltk-utf8-1.1.6/visualc/label.dsp --- fltk-1.1.6/visualc/label.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/label.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/label.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/label.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "label - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/labeld.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/labeld.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/libpng.dsp fltk-utf8-1.1.6/visualc/libpng.dsp --- fltk-1.1.6/visualc/libpng.dsp 2004-10-19 19:21:55.000000000 +0100 +++ fltk-utf8-1.1.6/visualc/libpng.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\fltkpng.lib" +# ADD LIB32 /nologo /out:"..\fltkutf8png.lib" !ELSEIF "$(CFG)" == "libpng - Win32 Debug" @@ -73,7 +73,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\lib\fltkpngd.lib" +# ADD LIB32 /nologo /out:"..\lib\fltkutf8pngd.lib" !ENDIF diff -ur -- fltk-1.1.6/visualc/line_style.dsp fltk-utf8-1.1.6/visualc/line_style.dsp --- fltk-1.1.6/visualc/line_style.dsp 2002-05-01 14:57:15.000000000 +0100 +++ fltk-utf8-1.1.6/visualc/line_style.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/line_style.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/line_style.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "line_style - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/line_styled.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/line_styled.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/mandelbrot.dsp fltk-utf8-1.1.6/visualc/mandelbrot.dsp --- fltk-1.1.6/visualc/mandelbrot.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/mandelbrot.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 glu32.lib opengl32.lib fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/mandelbrot.exe" /libpath:"..\lib" +# ADD LINK32 glu32.lib opengl32.lib fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/mandelbrot.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "mandelbrot - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 glu32.lib opengl32.lib fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/mandelbrotd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 glu32.lib opengl32.lib fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/mandelbrotd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/menubar.dsp fltk-utf8-1.1.6/visualc/menubar.dsp --- fltk-1.1.6/visualc/menubar.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/menubar.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /machine:I386 /nodefaultlib:"libcd" /out:"../test/menubar.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /machine:I386 /nodefaultlib:"libcd" /out:"../test/menubar.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "menubar - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/menubard.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/menubard.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/message.dsp fltk-utf8-1.1.6/visualc/message.dsp --- fltk-1.1.6/visualc/message.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/message.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/message.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/message.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "message - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/messaged.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/messaged.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/minimum.dsp fltk-utf8-1.1.6/visualc/minimum.dsp --- fltk-1.1.6/visualc/minimum.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/minimum.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/minimum.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/minimum.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "minimum - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/minimumd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/minimumd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/navigation.dsp fltk-utf8-1.1.6/visualc/navigation.dsp --- fltk-1.1.6/visualc/navigation.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/navigation.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/navigation.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/navigation.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "navigation - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/navigationd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/navigationd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/output.dsp fltk-utf8-1.1.6/visualc/output.dsp --- fltk-1.1.6/visualc/output.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/output.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/output.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/output.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "output - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/outputd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/outputd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/overlay.dsp fltk-utf8-1.1.6/visualc/overlay.dsp --- fltk-1.1.6/visualc/overlay.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/overlay.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/overlay.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/overlay.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "overlay - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/overlayd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/overlayd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/pack.dsp fltk-utf8-1.1.6/visualc/pack.dsp --- fltk-1.1.6/visualc/pack.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/pack.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/pack.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/pack.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "pack - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/packd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/packd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/pixmap.dsp fltk-utf8-1.1.6/visualc/pixmap.dsp --- fltk-1.1.6/visualc/pixmap.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/pixmap.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/pixmap.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/pixmap.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "pixmap - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/pixmapd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/pixmapd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/pixmap_browser.dsp fltk-utf8-1.1.6/visualc/pixmap_browser.dsp --- fltk-1.1.6/visualc/pixmap_browser.dsp 2004-11-20 03:44:18.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/pixmap_browser.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/pixmap_browser.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/pixmap_browser.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "pixmap_browser - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/pixmap_browserd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/pixmap_browserd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/preferences.dsp fltk-utf8-1.1.6/visualc/preferences.dsp --- fltk-1.1.6/visualc/preferences.dsp 2002-05-01 16:55:07.000000000 +0100 +++ fltk-utf8-1.1.6/visualc/preferences.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/preferences.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/preferences.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "preferences - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/preferencesd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/preferencesd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/radio.dsp fltk-utf8-1.1.6/visualc/radio.dsp --- fltk-1.1.6/visualc/radio.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/radio.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/radio.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/radio.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "radio - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/radiod.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/radiod.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/resize.dsp fltk-utf8-1.1.6/visualc/resize.dsp --- fltk-1.1.6/visualc/resize.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/resize.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/resize.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/resize.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "resize - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/resized.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/resized.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/resizebox.dsp fltk-utf8-1.1.6/visualc/resizebox.dsp --- fltk-1.1.6/visualc/resizebox.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/resizebox.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/resizebox.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/resizebox.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "resizebox - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/resizeboxd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/resizeboxd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/scroll.dsp fltk-utf8-1.1.6/visualc/scroll.dsp --- fltk-1.1.6/visualc/scroll.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/scroll.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/scroll.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/scroll.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "scroll - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/scrolld.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/scrolld.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/shape.dsp fltk-utf8-1.1.6/visualc/shape.dsp --- fltk-1.1.6/visualc/shape.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/shape.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 opengl32.lib fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/shape.exe" /libpath:"..\lib" +# ADD LINK32 opengl32.lib fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/shape.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "shape - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/shaped.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 opengl32.lib fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/shaped.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/subwindow.dsp fltk-utf8-1.1.6/visualc/subwindow.dsp --- fltk-1.1.6/visualc/subwindow.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/subwindow.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/subwindow.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/subwindow.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "subwindow - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/subwindowd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/subwindowd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/symbols.dsp fltk-utf8-1.1.6/visualc/symbols.dsp --- fltk-1.1.6/visualc/symbols.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/symbols.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/symbols.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/symbols.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "symbols - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/symbolsd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/symbolsd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/tabs.dsp fltk-utf8-1.1.6/visualc/tabs.dsp --- fltk-1.1.6/visualc/tabs.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/tabs.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/tabs.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/tabs.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "tabs - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/tabsd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/tabsd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/threads.dsp fltk-utf8-1.1.6/visualc/threads.dsp --- fltk-1.1.6/visualc/threads.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/threads.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/threads.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/threads.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "threads - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/threadsd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/threadsd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/tile.dsp fltk-utf8-1.1.6/visualc/tile.dsp --- fltk-1.1.6/visualc/tile.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/tile.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/tile.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/tile.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "tile - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/tiled.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/tiled.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/tiled_image.dsp fltk-utf8-1.1.6/visualc/tiled_image.dsp --- fltk-1.1.6/visualc/tiled_image.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/tiled_image.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/tiled_image.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/tiled_image.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "tiled_image - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/tiled_imaged.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/tiled_imaged.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF Only in fltk-utf8-1.1.6/visualc: utf8.dsp diff -ur -- fltk-1.1.6/visualc/valuators.dsp fltk-utf8-1.1.6/visualc/valuators.dsp --- fltk-1.1.6/visualc/valuators.dsp 2002-01-09 15:23:11.000000000 +0000 +++ fltk-utf8-1.1.6/visualc/valuators.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/valuators.exe" /libpath:"..\lib" +# ADD LINK32 fltkutf8.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../test/valuators.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "valuators - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/valuatorsd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 fltkutf8d.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/valuatorsd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff -ur -- fltk-1.1.6/visualc/zlib.dsp fltk-utf8-1.1.6/visualc/zlib.dsp --- fltk-1.1.6/visualc/zlib.dsp 2004-10-19 19:21:55.000000000 +0100 +++ fltk-utf8-1.1.6/visualc/zlib.dsp 2005-06-12 19:06:36.000000000 +0100 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\lib\fltkz.lib" +# ADD LIB32 /nologo /out:"..\lib\fltkutf8z.lib" !ELSEIF "$(CFG)" == "zlib - Win32 Debug" @@ -73,7 +73,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\lib\fltkzd.lib" +# ADD LIB32 /nologo /out:"..\lib\fltkutf8zd.lib" !ENDIF Only in fltk-utf8-1.1.6/: xutf8