Round 5 of wx3 changes

FileDialog now complete on Linux. Needs some fine tuning on Windows and OSX. Builds with wx3 and gtk2 or gtk3. Still more effect work to do.
2025-12-08 09:36:24 +01:00 · 2015-07-14 23:33:53 -05:00
parent 2f760c4bac
commit 9b9c8cc073
43 changed files with 3271 additions and 5352 deletions
--- a/lib-src/FileDialog/Makefile.in
+++ b/lib-src/FileDialog/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@

 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
@@ -78,34 +88,17 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@GENERIC_TRUE@am__append_1 = \
-@GENERIC_TRUE@	generic/FileDialogPrivate.cpp \
-@GENERIC_TRUE@	generic/FileDialogPrivate.h \
-@GENERIC_TRUE@	$(NULL)
-
-@GTK_TRUE@am__append_2 = $(GTK_CFLAGS)
-@GTK_TRUE@am__append_3 = $(GTK_LIBS)
-@GTK_TRUE@am__append_4 = \
+@GTK_TRUE@am__append_1 = $(GTK_CFLAGS)
+@GTK_TRUE@am__append_2 = $(GTK_LIBS)
+@GTK_TRUE@am__append_3 = \
@GTK_TRUE@	gtk/FileDialogPrivate.cpp \
@GTK_TRUE@	gtk/FileDialogPrivate.h \
@GTK_TRUE@	gtk/private.h \
@GTK_TRUE@	$(NULL)

-@MAC_TRUE@am__append_5 = mac/FileDialogPrivate.cpp mac/FileDialogPrivate.h
-@WINDOWS_TRUE@am__append_6 = win/FileDialogPrivate.cpp win/FileDialogPrivate.h
+@MAC_TRUE@am__append_4 = mac/FileDialogPrivate.cpp mac/FileDialogPrivate.h
+@WINDOWS_TRUE@am__append_5 = win/FileDialogPrivate.cpp win/FileDialogPrivate.h
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(top_srcdir)/autotools/depcomp autotools/ar-lib \
-	autotools/compile autotools/config.guess autotools/config.sub \
-	autotools/depcomp autotools/install-sh autotools/missing \
-	autotools/ltmain.sh $(top_srcdir)/autotools/ar-lib \
-	$(top_srcdir)/autotools/compile \
-	$(top_srcdir)/autotools/config.guess \
-	$(top_srcdir)/autotools/config.sub \
-	$(top_srcdir)/autotools/install-sh \
-	$(top_srcdir)/autotools/ltmain.sh \
-	$(top_srcdir)/autotools/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -113,6 +106,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -152,21 +147,17 @@ am__DEPENDENCIES_1 =
 libFileDialog_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2)
 am__libFileDialog_la_SOURCES_DIST = FileDialog.cpp FileDialog.h \
-	generic/FileDialogPrivate.cpp generic/FileDialogPrivate.h \
 	gtk/FileDialogPrivate.cpp gtk/FileDialogPrivate.h \
 	gtk/private.h mac/FileDialogPrivate.cpp \
 	mac/FileDialogPrivate.h win/FileDialogPrivate.cpp \
 	win/FileDialogPrivate.h
 am__dirstamp = $(am__leading_dot)dirstamp
-@GENERIC_TRUE@am__objects_1 =  \
-@GENERIC_TRUE@	generic/libFileDialog_la-FileDialogPrivate.lo
-@GTK_TRUE@am__objects_2 = gtk/libFileDialog_la-FileDialogPrivate.lo
-@MAC_TRUE@am__objects_3 = mac/libFileDialog_la-FileDialogPrivate.lo
-@WINDOWS_TRUE@am__objects_4 =  \
+@GTK_TRUE@am__objects_1 = gtk/libFileDialog_la-FileDialogPrivate.lo
+@MAC_TRUE@am__objects_2 = mac/libFileDialog_la-FileDialogPrivate.lo
+@WINDOWS_TRUE@am__objects_3 =  \
@WINDOWS_TRUE@	win/libFileDialog_la-FileDialogPrivate.lo
 am_libFileDialog_la_OBJECTS = libFileDialog_la-FileDialog.lo \
-	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
-	$(am__objects_4)
+	$(am__objects_1) $(am__objects_2) $(am__objects_3)
 libFileDialog_la_OBJECTS = $(am_libFileDialog_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -252,6 +243,17 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 AM_RECURSIVE_TARGETS = cscope
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/autotools/ar-lib \
+	$(top_srcdir)/autotools/compile \
+	$(top_srcdir)/autotools/config.guess \
+	$(top_srcdir)/autotools/config.sub \
+	$(top_srcdir)/autotools/depcomp \
+	$(top_srcdir)/autotools/install-sh \
+	$(top_srcdir)/autotools/ltmain.sh \
+	$(top_srcdir)/autotools/missing autotools/ar-lib \
+	autotools/compile autotools/config.guess autotools/config.sub \
+	autotools/depcomp autotools/install-sh autotools/ltmain.sh \
+	autotools/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -401,10 +403,10 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = FileDialog.vcproj FileDialogPrivate.h.in
 lib_LTLIBRARIES = libFileDialog.la
-libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) $(am__append_2)
-libFileDialog_la_LIBADD = $(WX_LIBS) $(am__append_3)
-libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h $(am__append_1) \
-	$(am__append_4) $(am__append_5) $(am__append_6)
+libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) $(am__append_1)
+libFileDialog_la_LIBADD = $(WX_LIBS) $(am__append_2)
+libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h $(am__append_3) \
+	$(am__append_4) $(am__append_5)
 all: all-am

 .SUFFIXES:
@@ -424,7 +426,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -478,14 +479,6 @@ clean-libLTLIBRARIES:
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
-generic/$(am__dirstamp):
-	@$(MKDIR_P) generic
-	@: > generic/$(am__dirstamp)
-generic/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) generic/$(DEPDIR)
-	@: > generic/$(DEPDIR)/$(am__dirstamp)
-generic/libFileDialog_la-FileDialogPrivate.lo:  \
-	generic/$(am__dirstamp) generic/$(DEPDIR)/$(am__dirstamp)
 gtk/$(am__dirstamp):
 	@$(MKDIR_P) gtk
 	@: > gtk/$(am__dirstamp)
@@ -516,8 +509,6 @@ libFileDialog.la: $(libFileDialog_la_OBJECTS) $(libFileDialog_la_DEPENDENCIES) $

 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f generic/*.$(OBJEXT)
-	-rm -f generic/*.lo
 	-rm -f gtk/*.$(OBJEXT)
 	-rm -f gtk/*.lo
 	-rm -f mac/*.$(OBJEXT)
@@ -529,7 +520,6 @@ distclean-compile:
 	-rm -f *.tab.c

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libFileDialog_la-FileDialog.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@generic/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gtk/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@mac/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@win/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Plo@am__quote@
@@ -565,13 +555,6 @@ libFileDialog_la-FileDialog.lo: FileDialog.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libFileDialog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libFileDialog_la-FileDialog.lo `test -f 'FileDialog.cpp' || echo '$(srcdir)/'`FileDialog.cpp

-generic/libFileDialog_la-FileDialogPrivate.lo: generic/FileDialogPrivate.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libFileDialog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT generic/libFileDialog_la-FileDialogPrivate.lo -MD -MP -MF generic/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Tpo -c -o generic/libFileDialog_la-FileDialogPrivate.lo `test -f 'generic/FileDialogPrivate.cpp' || echo '$(srcdir)/'`generic/FileDialogPrivate.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) generic/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Tpo generic/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='generic/FileDialogPrivate.cpp' object='generic/libFileDialog_la-FileDialogPrivate.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libFileDialog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o generic/libFileDialog_la-FileDialogPrivate.lo `test -f 'generic/FileDialogPrivate.cpp' || echo '$(srcdir)/'`generic/FileDialogPrivate.cpp
-
 gtk/libFileDialog_la-FileDialogPrivate.lo: gtk/FileDialogPrivate.cpp
@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libFileDialog_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtk/libFileDialog_la-FileDialogPrivate.lo -MD -MP -MF gtk/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Tpo -c -o gtk/libFileDialog_la-FileDialogPrivate.lo `test -f 'gtk/FileDialogPrivate.cpp' || echo '$(srcdir)/'`gtk/FileDialogPrivate.cpp
@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gtk/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Tpo gtk/$(DEPDIR)/libFileDialog_la-FileDialogPrivate.Plo
@@ -598,7 +581,6 @@ mostlyclean-libtool:

 clean-libtool:
 	-rm -rf .libs _libs
-	-rm -rf generic/.libs generic/_libs
 	-rm -rf gtk/.libs gtk/_libs
 	-rm -rf mac/.libs mac/_libs
 	-rm -rf win/.libs win/_libs
@@ -720,15 +702,15 @@ dist-xz: distdir
 	$(am__post_remove_distdir)

 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)

 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
@@ -764,17 +746,17 @@ distcheck: dist
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -860,8 +842,6 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f generic/$(DEPDIR)/$(am__dirstamp)
-	-rm -f generic/$(am__dirstamp)
 	-rm -f gtk/$(DEPDIR)/$(am__dirstamp)
 	-rm -f gtk/$(am__dirstamp)
 	-rm -f mac/$(DEPDIR)/$(am__dirstamp)
@@ -879,7 +859,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \

 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR) generic/$(DEPDIR) gtk/$(DEPDIR) mac/$(DEPDIR) win/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) gtk/$(DEPDIR) mac/$(DEPDIR) win/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -927,7 +907,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR) generic/$(DEPDIR) gtk/$(DEPDIR) mac/$(DEPDIR) win/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) gtk/$(DEPDIR) mac/$(DEPDIR) win/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

@@ -965,6 +945,8 @@ uninstall-am: uninstall-libLTLIBRARIES
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES

+.PRECIOUS: Makefile
+

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.